X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=.gitignore;h=93cfeff1451161777fcb0ac6b741195ac11a49b4;hb=21331d9a98591e5712c7f4fd84cf1065fb32427a;hp=f2564767107086e60dc84b987e4fb5c72b9721cb;hpb=ccc83a140df840c2004ae8b5305a809a49a1f10d;p=debian6500.git

diff --git a/.gitignore b/.gitignore
index f256476..93cfeff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,127 +1,20 @@
-.sconsign.dblite
-config.log
-prod
-prod_rhp*
+#####################################################################
+# Temp/IDE generated files
+#####################################################################
 *~
 *.contrib*
 *.keep
+*.merge
 *.pyc
 *.o
 *.os
-
-dev/*mccm_generated
-dev/modele/implementation/trc6500_chaine_*/*/gcc_debian_tao
-dev/modele/implementation/trc6500_chaine_*/*/mccm_generated
-dev/modele/implementation/trc6500_chaine_gon/Lsu/libserveur_lsu_config.a
-dev/modele/implementation/trc6500_testu/trc6500_simu_df/*/gcc_debian_tao
-dev/modele/implementation/trc6500_testu/trc6500_simu_df/*/mccm_generated
-dev/modele/implementation/trc6500_testu/trc6500_simu_soi/*/gcc_debian_tao
-dev/modele/implementation/trc6500_testu/trc6500_simu_soi/*/mccm_generated
-dev/modele/implementation_bouchon/trc6500_chaine_*/*/gcc_debian_tao
-dev/modele/implementation_bouchon/trc6500_chaine_*/*/mccm_generated
-
-#symbolic links
-dev/code_metier/monitoring/cfg/*.xml
-dev/code_metier/serveur_iqrec/filt_dec_inc/*.h
-
-dev/common/libfe306/inc
-dev/common/libfe306/src
-
-dev/tools/conversions/bin2sig/src/erreur.c
-dev/tools/conversions/bin2sig/src/file_118.c
-dev/tools/conversions/bin2sig/src/outils.c
-dev/tools/conversions/bin2sig/src/signaux.c
-dev/tools/conversions/dfe2sig/src/erreur.c
-dev/tools/conversions/dfe2sig/src/file_118.c
-dev/tools/conversions/dfe2sig/src/outils.c
-dev/tools/conversions/dfe2sig/src/signaux.c
-
-dev/tools/sim_multicast/sim_multicast/src/CUdpSocket.cpp
-dev/tools/sim_multicast/sim_multicast/src/erreur.c
-dev/tools/sim_multicast/sim_multicast/src/file_118.c
-dev/tools/sim_multicast/sim_multicast/src/freq_plan_common.c
-dev/tools/sim_multicast/sim_multicast/src/outils.c
-dev/tools/sim_multicast/sim_multicast/src/signaux.c
-
-dev/tools/sniffers/sniffer_suivi_soi/CUdpSocket.cpp
-dev/tools/sniffers/sniffer_suivi_soi/Exception.cpp
-dev/tools/sniffers/sniffer_suivi_soi/HtoN.cpp
-dev/tools/sniffers/sniffer_suivi_soi/NtoH.cpp
-
-# generated link to libsignl submodule/vob
-dev/common/libspe/trt/libsignl/inc
-dev/common/libspe/trt/libsignl/src
-
-# generated link to dev_pet/pet_tod/traitements/libcode submodule/vob
-dev/common/libspe/trt/libcode/inc
-dev/common/libspe/trt/libcode/src
-
-dev/common/libspe/trt/ac/inc
-dev/common/libspe/trt/ac/src/c_*.c
-
-dev/common/libspe/trt/ic/inc/proto_ic.h
-dev/common/libspe/trt/ic/src/*.c
-dev/common/libspe/trt/ic/inc/i_alis/i_alis.h
-dev/common/libspe/trt/ic/src/i_alis/i_alis.c
-
-#####################################################################
-# libspe/spe
-#####################################################################
-# generated link to dev_pet/pet_interface submodule/vob
-dev/common/libspe/spe/cfg/*.xml
-
-#####################################################################
-# libspe/trt/common
-#####################################################################
-# generated link to dev_pet/pet_interface submodule/vob
-dev/common/libspe/trt/common/inc/messagerie.h
-# generated link to dev_pet/pet_tod/traitements submodule/vob
-dev/common/libspe/trt/common/inc/*.h
-dev/common/libspe/trt/common/src/paramtrt.c
-
-#####################################################################
-# libspe/trt/analyse
-#####################################################################
-# generated link to dev_pet/pet_tod/traitements/analyse submodule/vob
-dev/common/libspe/trt/analyse/inc
-dev/common/libspe/trt/analyse/recocod/recocod.cfg
-
-# generated link to dev_pet/pet_tod/traitements/recomod submodule/vob
-dev/common/libspe/trt/analyse/recomod/inc/proto_rm.h
-dev/common/libspe/trt/analyse/recomod/src/rec_modt.c
-dev/common/libspe/trt/analyse/recomod/inc/recomod
-dev/common/libspe/trt/analyse/recomod/src/recomod
-
-# generated link to dev_pet/pet_tod/traitements/modem submodule/vob
-dev/common/libspe/trt/analyse/recomod/inc/acars/demo_acars.h
-dev/common/libspe/trt/analyse/recomod/src/acars/demo_acars.c
-dev/common/libspe/trt/analyse/recomod/inc/acars/transpo_filtrage.h
-dev/common/libspe/trt/analyse/recomod/src/acars/transpo_filtrage.c
-
-# generated link to traitements_analyse_transmission/identification submodule/vob
-dev/common/libspe/trt/analyse/recomod/inc/identification
-dev/common/libspe/trt/analyse/recomod/src/identification/*.c
-
-
-#####################################################################
-# libspe/trt/sp
-#####################################################################
-dev/common/libspe/trt/sp/src/p_*.c
-# generated link to dev_pet/pet_tod/traitements/suivi protocole submodule/vob
-dev/common/libspe/trt/sp/inc/proto_sp.h
-# generated link to dev_pet/pet_tod/traitements/suivi protocole/p_rds submodule/vob
-dev/common/libspe/trt/sp/inc/p_rds/*.h
-dev/common/libspe/trt/sp/src/p_rds/p_RDS.c
-# generated link to dev_pet/pet_tod/traitements/suivi protocole/p_alis submodule/vob
-dev/common/libspe/trt/sp/inc/p_alis/p_alis.h
-dev/common/libspe/trt/sp/src/p_alis/p_alis.c
-
-#####################################################################
-# libspe/trt/md
-#####################################################################
-# generated link to dev_pet/pet_tod/traitements/modem submodule/vob
-dev/common/libspe/trt/md/inc/proto_md.h
-dev/common/libspe/trt/md/inc/cag_phonie.h
-dev/common/libspe/trt/md/src/cag_phonie.c
-dev/common/libspe/trt/md/src/dem_*.c
-
+.*project
+.settings
+*.iso
+trc6500-master-file_*.deb
+simple-cdd/build.log
+simple-cdd/dists/
+simple-cdd/images/
+
+trc6500-master-file/deb
+master/etc/trc6500_os_version