David Rose 24 éve
szülő
commit
56f8e165df

+ 32 - 32
dtool/pptempl/Template.autoconf.pp

@@ -133,7 +133,7 @@ endif
 
 
 IGATESCAN = $[IGATESCAN]
 IGATESCAN = $[IGATESCAN]
 $[IGATEFILE] : $(IGATESCAN)
 $[IGATEFILE] : $(IGATESCAN)
-	@dtool@/bin/interrogate $[IGATEFLAGS] @system_igate@ -DCPPPARSER -D__cplusplus -I@dtool@/include/parser-inc @trees_inc@ $[local_incs:%=-I%] $[alt_cflags] $[CDEFINES] -module "$[IGATEMODULE]" -library "$[IGATELIBRARY]" -oc $[IGATEFILE] -od $[IGATEDBFILE] -fnames -string -refcount -assert -promiscuous -python $(IGATESCAN)
+        @dtool@/bin/interrogate $[IGATEFLAGS] @system_igate@ -DCPPPARSER -D__cplusplus -I@dtool@/include/parser-inc @trees_inc@ $[local_incs:%=-I%] $[alt_cflags] $[CDEFINES] -module "$[IGATEMODULE]" -library "$[IGATELIBRARY]" -oc $[IGATEFILE] -od $[IGATEDBFILE] -fnames -string -refcount -assert -promiscuous -python $(IGATESCAN)
 #set built_sources $[built_sources] $[IGATEFILE]
 #set built_sources $[built_sources] $[IGATEFILE]
 #set install_data $[install_data] $[IGATEDBFILE]
 #set install_data $[install_data] $[IGATEDBFILE]
 #endif
 #endif
@@ -304,23 +304,23 @@ EXTRA_DIST = Sources.pp Config.pp $[EXTRA_DIST]
 # installed shared libraries.
 # installed shared libraries.
 
 
 all-recursive:
 all-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(FIRSTBUILD_SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
+        @set fnord $(MAKEFLAGS); amf=$$2; \
+        dot_seen=no; \
+        target=`echo $@ | sed s/-recursive//`; \
+        list='$(FIRSTBUILD_SUBDIRS)'; for subdir in $$list; do \
+          echo "Making $$target in $$subdir"; \
+          if test "$$subdir" = "."; then \
+            dot_seen=yes; \
+            local_target="$$target-am"; \
+          else \
+            local_target="$$target"; \
+          fi; \
+          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+        done; \
+        if test "$$dot_seen" = "no"; then \
+          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+        fi; test -z "$$fail"
 
 
 #end Makefile.am
 #end Makefile.am
 
 
@@ -543,11 +543,11 @@ if test "$with_python" != "no"; then
   if test "$with_python" = "yes" -o "$with_python" = ""; then
   if test "$with_python" = "yes" -o "$with_python" = ""; then
     AC_SEARCH_HPACKAGE(/usr/local /usr,
     AC_SEARCH_HPACKAGE(/usr/local /usr,
                        python1.6 python,
                        python1.6 python,
-	               Python.h, python)
+                       Python.h, python)
   else
   else
     AC_SEARCH_HPACKAGE($with_python,
     AC_SEARCH_HPACKAGE($with_python,
                        python1.6 python,
                        python1.6 python,
-	               Python.h, python)
+                       Python.h, python)
   fi
   fi
 
 
   if test "$with_python" != ""; then
   if test "$with_python" != ""; then
@@ -586,10 +586,10 @@ include_nspr=
 if test "$with_nspr" != "no"; then
 if test "$with_nspr" != "no"; then
   if test "$with_nspr" = "yes" -o "$with_nspr" = ""; then
   if test "$with_nspr" = "yes" -o "$with_nspr" = ""; then
     AC_SEARCH_PACKAGE(/usr/local/mozilla /usr/local/mozilla/dist/*,,
     AC_SEARCH_PACKAGE(/usr/local/mozilla /usr/local/mozilla/dist/*,,
-	              nspr.h, nspr3, PR_Init, nspr)
+                      nspr.h, nspr3, PR_Init, nspr)
   else
   else
     AC_SEARCH_PACKAGE($with_nspr $with_nspr/dist/*,,
     AC_SEARCH_PACKAGE($with_nspr $with_nspr/dist/*,,
-	              nspr.h, nspr3, PR_Init, nspr)
+                      nspr.h, nspr3, PR_Init, nspr)
   fi
   fi
 
 
   if test "$with_nspr" != ""; then
   if test "$with_nspr" != ""; then
@@ -632,10 +632,10 @@ include_zlib=
 if test "$with_zlib" != "no"; then
 if test "$with_zlib" != "no"; then
   if test "$with_zlib" = "yes" -o "$with_zlib" = ""; then
   if test "$with_zlib" = "yes" -o "$with_zlib" = ""; then
     AC_SEARCH_PACKAGE(/usr /usr/local,,
     AC_SEARCH_PACKAGE(/usr /usr/local,,
-	              zlib.h, z, gzopen, zlib)
+                      zlib.h, z, gzopen, zlib)
   else
   else
     AC_SEARCH_PACKAGE($with_zlib,,
     AC_SEARCH_PACKAGE($with_zlib,,
-	              zlib.h, z, gzopen, zlib)
+                      zlib.h, z, gzopen, zlib)
   fi
   fi
 
 
   if test "$with_zlib" != ""; then
   if test "$with_zlib" != ""; then
@@ -682,10 +682,10 @@ include_gl=
 if test "$with_gl" != "no"; then
 if test "$with_gl" != "no"; then
   if test "$with_gl" = "yes" -o "$with_gl" = ""; then
   if test "$with_gl" = "yes" -o "$with_gl" = ""; then
     AC_SEARCH_PACKAGE(/usr /usr/local,,
     AC_SEARCH_PACKAGE(/usr /usr/local,,
-	              GL/gl.h, GL, glVertex3f, gl)
+                      GL/gl.h, GL, glVertex3f, gl)
   else
   else
     AC_SEARCH_PACKAGE($with_gl,,
     AC_SEARCH_PACKAGE($with_gl,,
-	              GL/gl.h, GL, glVertex3f, gl)
+                      GL/gl.h, GL, glVertex3f, gl)
   fi
   fi
 
 
   if test "$with_gl" != ""; then
   if test "$with_gl" != ""; then
@@ -732,10 +732,10 @@ include_glu=
 if test "$with_glu" != "no"; then
 if test "$with_glu" != "no"; then
   if test "$with_glu" = "yes" -o "$with_glu" = ""; then
   if test "$with_glu" = "yes" -o "$with_glu" = ""; then
     AC_SEARCH_PACKAGE($gl_INCLUDE /usr /usr/local,,
     AC_SEARCH_PACKAGE($gl_INCLUDE /usr /usr/local,,
-	              GL/glu.h, GLU, gluSphere, glu)
+                      GL/glu.h, GLU, gluSphere, glu)
   else
   else
     AC_SEARCH_PACKAGE($with_glu,,
     AC_SEARCH_PACKAGE($with_glu,,
-	              GL/glu.h, GLU, gluSphere, glu)
+                      GL/glu.h, GLU, gluSphere, glu)
   fi
   fi
 
 
   if test "$with_glu" != ""; then
   if test "$with_glu" != ""; then
@@ -782,10 +782,10 @@ include_glx=
 if test "$with_glx" != "no"; then
 if test "$with_glx" != "no"; then
   if test "$with_glx" = "yes" -o "$with_glx" = ""; then
   if test "$with_glx" = "yes" -o "$with_glx" = ""; then
     AC_SEARCH_HPACKAGE($gl_INCLUDE /usr /usr/local $x_libraries,,
     AC_SEARCH_HPACKAGE($gl_INCLUDE /usr /usr/local $x_libraries,,
-	               GL/glx.h, glx)
+                       GL/glx.h, glx)
   else
   else
     AC_SEARCH_HPACKAGE($with_glx,,
     AC_SEARCH_HPACKAGE($with_glx,,
-	               GL/glx.h, glx)
+                       GL/glx.h, glx)
   fi
   fi
 
 
   if test "$with_glx" != ""; then
   if test "$with_glx" != ""; then
@@ -826,10 +826,10 @@ include_glut=
 if test "$with_glut" != "no"; then
 if test "$with_glut" != "no"; then
   if test "$with_glut" = "yes" -o "$with_glut" = ""; then
   if test "$with_glut" = "yes" -o "$with_glut" = ""; then
     AC_SEARCH_PACKAGE($gl_INCLUDE /usr /usr/local $x_libraries,,
     AC_SEARCH_PACKAGE($gl_INCLUDE /usr /usr/local $x_libraries,,
-	              GL/glut.h, glut, glutInit, glut, -lGL -lGLU)
+                      GL/glut.h, glut, glutInit, glut, -lGL -lGLU)
   else
   else
     AC_SEARCH_PACKAGE($with_glut,,
     AC_SEARCH_PACKAGE($with_glut,,
-	              GLUT/glut.h, glut, glutInit, glut, -lGL -lGLU)
+                      GLUT/glut.h, glut, glutInit, glut, -lGL -lGLU)
   fi
   fi
 
 
   if test "$with_glut" != ""; then
   if test "$with_glut" != ""; then

+ 60 - 60
dtool/pptempl/Template.models.pp

@@ -101,23 +101,23 @@ uninstall : uninstall-other uninstall-bam uninstall-egg
 
 
 clean-bam :
 clean-bam :
 #if $[bam_targets]
 #if $[bam_targets]
-	rm -rf $[bam_dir]
+        rm -rf $[bam_dir]
 #endif
 #endif
 
 
 clean-pal : clean-bam
 clean-pal : clean-bam
 #if $[pal_egg_targets]
 #if $[pal_egg_targets]
-	rm -rf $[pal_egg_dir]
+        rm -rf $[pal_egg_dir]
 #endif
 #endif
 
 
 clean : clean-pal
 clean : clean-pal
 #if $[build_eggs]
 #if $[build_eggs]
-	rm -f $[build_eggs] $[install_eggs:%.egg=%.pt]
+        rm -f $[build_eggs] $[install_eggs:%.egg=%.pt]
 #endif
 #endif
 #if $[POLY_MODEL(soft_char_egg)] $[NURBS_MODEL(soft_char_egg)]
 #if $[POLY_MODEL(soft_char_egg)] $[NURBS_MODEL(soft_char_egg)]
-	rm -rf $[soft_maps_dir]
+        rm -rf $[soft_maps_dir]
 #endif
 #endif
 #if $[filter_dirs]
 #if $[filter_dirs]
-	rm -rf $[filter_dirs]
+        rm -rf $[filter_dirs]
 #endif
 #endif
 
 
 // We need a rule for each directory we might need to make.  This
 // We need a rule for each directory we might need to make.  This
@@ -133,16 +133,16 @@ clean : clean-pal
     $[install_other_dirs] \
     $[install_other_dirs] \
     ]
     ]
 $[directory] :
 $[directory] :
-	@test -d $[directory] || echo mkdir -p $[directory]
-	@test -d $[directory] || mkdir -p $[directory]
+        @test -d $[directory] || echo mkdir -p $[directory]
+        @test -d $[directory] || mkdir -p $[directory]
 
 
 // Sometimes we need a target to depend on the directory existing, without 
 // Sometimes we need a target to depend on the directory existing, without 
 // being fooled by the directory's modification times.  We use this
 // being fooled by the directory's modification times.  We use this
 // phony timestamp file to achieve that.
 // phony timestamp file to achieve that.
 $[directory]/stamp :
 $[directory]/stamp :
-	@test -d $[directory] || echo mkdir -p $[directory]
-	@test -d $[directory] || mkdir -p $[directory]
-	@touch $[directory]/stamp
+        @test -d $[directory] || echo mkdir -p $[directory]
+        @test -d $[directory] || mkdir -p $[directory]
+        @touch $[directory]/stamp
 #end directory
 #end directory
 
 
 
 
@@ -152,7 +152,7 @@ $[directory]/stamp :
     #define target $[flt:%.flt=%.egg]
     #define target $[flt:%.flt=%.egg]
     #define source $[flt]
     #define source $[flt]
 $[target] : $[source]
 $[target] : $[source]
-	flt2egg $[FLT2EGG_OPTS] -o $[target] $[source]
+        flt2egg $[FLT2EGG_OPTS] -o $[target] $[source]
 
 
   #end flt
   #end flt
 #end flt_egg
 #end flt_egg
@@ -163,7 +163,7 @@ $[target] : $[source]
     #define target $[lwo:%.lwo=%.egg]
     #define target $[lwo:%.lwo=%.egg]
     #define source $[lwo]
     #define source $[lwo]
 $[target] : $[source]
 $[target] : $[source]
-	lwo2egg $[LWO2EGG_OPTS] -o $[target] $[source]
+        lwo2egg $[LWO2EGG_OPTS] -o $[target] $[source]
 
 
   #end lwo
   #end lwo
 #end lwo_egg
 #end lwo_egg
@@ -175,14 +175,14 @@ $[target] : $[source]
     #define scene $[SCENE_PREFIX]$[MODEL].1-0.dsc
     #define scene $[SCENE_PREFIX]$[MODEL].1-0.dsc
     #define source $[DATABASE]/SCENES/$[scene]
     #define source $[DATABASE]/SCENES/$[scene]
 $[target] : $[source]
 $[target] : $[source]
-	soft2egg $[SOFT2EGG_OPTS] -p -M $[target] -N $[CHAR_NAME] -d $[DATABASE] -s $[scene] -t $[soft_maps_dir]
+        soft2egg $[SOFT2EGG_OPTS] -p -M $[target] -N $[CHAR_NAME] -d $[DATABASE] -s $[scene] -t $[soft_maps_dir]
   #endif
   #endif
   #if $[NURBS_MODEL]
   #if $[NURBS_MODEL]
     #define target $[EGG_PREFIX]$[NURBS_MODEL].egg
     #define target $[EGG_PREFIX]$[NURBS_MODEL].egg
     #define scene $[SCENE_PREFIX]$[MODEL].1-0.dsc
     #define scene $[SCENE_PREFIX]$[MODEL].1-0.dsc
     #define source $[DATABASE]/SCENES/$[scene]
     #define source $[DATABASE]/SCENES/$[scene]
 $[target] : $[source]
 $[target] : $[source]
-	soft2egg $[SOFT2EGG_OPTS] -n -M $[target] -N $[CHAR_NAME] -d $[DATABASE] -s $[scene] -t $[soft_maps_dir]
+        soft2egg $[SOFT2EGG_OPTS] -n -M $[target] -N $[CHAR_NAME] -d $[DATABASE] -s $[scene] -t $[soft_maps_dir]
   #endif
   #endif
 
 
 #end soft_char_egg
 #end soft_char_egg
@@ -200,7 +200,7 @@ $[target] : $[source]
       #set end $[word 2,$[$[anim]_frames]]
       #set end $[word 2,$[$[anim]_frames]]
     #endif
     #endif
 $[target] : $[source]
 $[target] : $[source]
-	soft2egg $[SOFT2EGG_OPTS] -a -A $[target] -N $[CHAR_NAME] -d $[DATABASE] -s $[scene] $[begin:%=-b%] $[end:%=-e%]
+        soft2egg $[SOFT2EGG_OPTS] -a -A $[target] -N $[CHAR_NAME] -d $[DATABASE] -s $[scene] $[begin:%=-b%] $[end:%=-e%]
   #end anim
   #end anim
 #end soft_char_egg
 #end soft_char_egg
 
 
@@ -211,7 +211,7 @@ $[target] : $[source]
     #define source $[source_prefix]$[egg]
     #define source $[source_prefix]$[egg]
     #define target $[TARGET_DIR]/$[notdir $[egg]]
     #define target $[TARGET_DIR]/$[notdir $[egg]]
 $[target] : $[source] $[pt] $[TARGET_DIR]/stamp
 $[target] : $[source] $[pt] $[TARGET_DIR]/stamp
-	$[COMMAND]
+        $[COMMAND]
   #end egg
   #end egg
 #end filter_egg
 #end filter_egg
 
 
@@ -224,12 +224,12 @@ $[target] : $[source] $[pt] $[TARGET_DIR]/stamp
    // first one.
    // first one.
   #foreach egg $[notdir $[wordlist 2,9999,$[SOURCES]]]
   #foreach egg $[notdir $[wordlist 2,9999,$[SOURCES]]]
 $[TARGET_DIR]/$[egg] : $[target] $[TARGET_DIR]/stamp
 $[TARGET_DIR]/$[egg] : $[target] $[TARGET_DIR]/stamp
-	touch $[TARGET_DIR]/$[egg]
+        touch $[TARGET_DIR]/$[egg]
   #end egg
   #end egg
 
 
    // And this is the actual optchar pass.
    // And this is the actual optchar pass.
 $[target] : $[sources] $[TARGET_DIR]/stamp
 $[target] : $[sources] $[TARGET_DIR]/stamp
-	egg-optchar $[OPTCHAR_OPTS] -d $[TARGET_DIR] $[sources]
+        egg-optchar $[OPTCHAR_OPTS] -d $[TARGET_DIR] $[sources]
 #end optchar_egg
 #end optchar_egg
 
 
 
 
@@ -241,13 +241,13 @@ $[target] : $[sources] $[TARGET_DIR]/stamp
     #define target $[pal_egg_dir]/$[egg]
     #define target $[pal_egg_dir]/$[egg]
 $[target] : $[source] $[pt] $[pal_egg_dir]/stamp
 $[target] : $[source] $[pt] $[pal_egg_dir]/stamp
     #if $[PHASE]
     #if $[PHASE]
-	egg-palettize $[PALETTIZE_OPTS] -a $[texattrib_file] -dr $[install_dir] -dm $[install_dir]/%g/maps -ds $[install_dir]/shadow_pal -g phase_$[PHASE] -gdir phase_$[PHASE] -o $[target] $[source]
+        egg-palettize $[PALETTIZE_OPTS] -a $[texattrib_file] -dr $[install_dir] -dm $[install_dir]/%g/maps -ds $[install_dir]/shadow_pal -g phase_$[PHASE] -gdir phase_$[PHASE] -o $[target] $[source]
     #else
     #else
-	egg-palettize $[PALETTIZE_OPTS] -a $[texattrib_file] -dr $[install_dir] -dm $[install_dir]/%g/maps -ds $[install_dir]/shadow_pal -o $[target] $[source]
+        egg-palettize $[PALETTIZE_OPTS] -a $[texattrib_file] -dr $[install_dir] -dm $[install_dir]/%g/maps -ds $[install_dir]/shadow_pal -o $[target] $[source]
     #endif
     #endif
 
 
 $[pt] :
 $[pt] :
-	touch $[pt]
+        touch $[pt]
 
 
   #end egg
   #end egg
 #end install_egg
 #end install_egg
@@ -259,14 +259,14 @@ $[pt] :
     #define source $[pal_egg_dir]/$[egg]
     #define source $[pal_egg_dir]/$[egg]
     #define target $[bam_dir]/$[egg:%.egg=%.bam]
     #define target $[bam_dir]/$[egg:%.egg=%.bam]
 $[target] : $[source] $[bam_dir]/stamp
 $[target] : $[source] $[bam_dir]/stamp
-	egg2bam -kp -tp $[install_dir] $[EGG2BAM_OPTS] -o $[target] $[source]
+        egg2bam -kp -tp $[install_dir] $[EGG2BAM_OPTS] -o $[target] $[source]
 
 
   #end egg
   #end egg
   #foreach egg $[UNPAL_SOURCES]
   #foreach egg $[UNPAL_SOURCES]
     #define source $[source_prefix]$[egg]
     #define source $[source_prefix]$[egg]
     #define target $[bam_dir]/$[egg:%.egg=%.bam]
     #define target $[bam_dir]/$[egg:%.egg=%.bam]
 $[target] : $[source] $[bam_dir]/stamp
 $[target] : $[source] $[bam_dir]/stamp
-	egg2bam -kp -tp $[install_dir] $[EGG2BAM_OPTS] -o $[target] $[source]
+        egg2bam -kp -tp $[install_dir] $[EGG2BAM_OPTS] -o $[target] $[source]
 
 
   #end egg
   #end egg
 #end install_egg
 #end install_egg
@@ -279,18 +279,18 @@ $[target] : $[source] $[bam_dir]/stamp
     #define sourcedir $[pal_egg_dir]
     #define sourcedir $[pal_egg_dir]
     #define dest $[install_model_dir]
     #define dest $[install_model_dir]
 $[dest]/$[local] : $[sourcedir]/$[local]
 $[dest]/$[local] : $[sourcedir]/$[local]
-//	cd ./$[sourcedir] && $[INSTALL]
-	rm -f $[dest]/$[local]
-	cp $[sourcedir]/$[local] $[dest]
+//      cd ./$[sourcedir] && $[INSTALL]
+        rm -f $[dest]/$[local]
+        cp $[sourcedir]/$[local] $[dest]
 
 
   #end egg
   #end egg
   #foreach egg $[UNPAL_SOURCES]
   #foreach egg $[UNPAL_SOURCES]
     #define local $[egg]
     #define local $[egg]
     #define dest $[install_model_dir]
     #define dest $[install_model_dir]
 $[dest]/$[local] : $[source_prefix]$[local]
 $[dest]/$[local] : $[source_prefix]$[local]
-//	$[INSTALL]
-	rm -f $[dest]/$[local]
-	cp $[source_prefix]$[local] $[dest]
+//      $[INSTALL]
+        rm -f $[dest]/$[local]
+        cp $[source_prefix]$[local] $[dest]
 
 
   #end egg
   #end egg
 #end install_egg
 #end install_egg
@@ -300,7 +300,7 @@ uninstall-egg :
 #forscopes install_egg
 #forscopes install_egg
   #define files $[patsubst %,$[install_model_dir]/%,$[SOURCES] $[UNPAL_SOURCES]]
   #define files $[patsubst %,$[install_model_dir]/%,$[SOURCES] $[UNPAL_SOURCES]]
   #if $[files]
   #if $[files]
-	rm -f $[files]
+        rm -f $[files]
   #endif
   #endif
 #end install_egg
 #end install_egg
 
 
@@ -312,9 +312,9 @@ uninstall-egg :
     #define sourcedir $[bam_dir]
     #define sourcedir $[bam_dir]
     #define dest $[install_model_dir]
     #define dest $[install_model_dir]
 $[dest]/$[local] : $[sourcedir]/$[local]
 $[dest]/$[local] : $[sourcedir]/$[local]
-//	cd ./$[sourcedir] && $[INSTALL]
-	rm -f $[dest]/$[local]
-	cp $[sourcedir]/$[local] $[dest]
+//      cd ./$[sourcedir] && $[INSTALL]
+        rm -f $[dest]/$[local]
+        cp $[sourcedir]/$[local] $[dest]
 
 
   #end egg
   #end egg
 #end install_egg
 #end install_egg
@@ -324,7 +324,7 @@ uninstall-bam :
 #forscopes install_egg
 #forscopes install_egg
   #define files $[patsubst %.egg,$[install_model_dir]/%.bam,$[SOURCES] $[UNPAL_SOURCES]]
   #define files $[patsubst %.egg,$[install_model_dir]/%.bam,$[SOURCES] $[UNPAL_SOURCES]]
   #if $[files]
   #if $[files]
-	rm -f $[files]
+        rm -f $[files]
   #endif
   #endif
 #end install_egg
 #end install_egg
 
 
@@ -336,9 +336,9 @@ uninstall-bam :
     #define local $[file]
     #define local $[file]
     #define dest $[install_model_dir]
     #define dest $[install_model_dir]
 $[dest]/$[local] : $[local]
 $[dest]/$[local] : $[local]
-//	$[INSTALL]
-	rm -f $[dest]/$[local]
-	cp $[local] $[dest]
+//      $[INSTALL]
+        rm -f $[dest]/$[local]
+        cp $[local] $[dest]
 
 
   #end file
   #end file
 #end install_audio install_dna install_icons install_misc
 #end install_audio install_dna install_icons install_misc
@@ -348,7 +348,7 @@ uninstall-other:
 #forscopes install_audio install_dna install_icons install_misc
 #forscopes install_audio install_dna install_icons install_misc
   #define files $[patsubst %,$[install_model_dir]/%,$[SOURCES]]
   #define files $[patsubst %,$[install_model_dir]/%,$[SOURCES]]
   #if $[files]
   #if $[files]
-	rm -f $[files]
+        rm -f $[files]
   #endif
   #endif
 #end install_audio install_dna install_icons install_misc
 #end install_audio install_dna install_icons install_misc
 
 
@@ -416,7 +416,7 @@ opt-pal : pal do-opt-pal install
 optimize-palettes : opt-pal
 optimize-palettes : opt-pal
 
 
 do-opt-pal :
 do-opt-pal :
-	egg-palettize $[PALETTIZE_OPTS] -a $[texattrib_file] -opt -egg
+        egg-palettize $[PALETTIZE_OPTS] -a $[texattrib_file] -opt -egg
 
 
 #
 #
 # repal : reexamine the textures.txa file and do whatever needs to be
 # repal : reexamine the textures.txa file and do whatever needs to be
@@ -424,7 +424,7 @@ do-opt-pal :
 # files are up-to-date.
 # files are up-to-date.
 #
 #
 repal :
 repal :
-	egg-palettize $[PALETTIZE_OPTS] -a $[texattrib_file] -all -egg
+        egg-palettize $[PALETTIZE_OPTS] -a $[texattrib_file] -all -egg
 
 
 re-pal : repal
 re-pal : repal
 
 
@@ -433,27 +433,27 @@ re-pal : repal
 # palette images to fix it.
 # palette images to fix it.
 #
 #
 fix-pal :
 fix-pal :
-	egg-palettize $[PALETTIZE_OPTS] -a $[texattrib_file] -redo -all -egg
+        egg-palettize $[PALETTIZE_OPTS] -a $[texattrib_file] -redo -all -egg
 
 
 #
 #
 # redo-pal : blow away all the palettization information and start fresh.
 # redo-pal : blow away all the palettization information and start fresh.
 #
 #
 redo-pal : clean-pal
 redo-pal : clean-pal
-	rm -f $[texattrib_file:%.txa=%.boo]
+        rm -f $[texattrib_file:%.txa=%.boo]
 
 
 #
 #
 # pi : report the palettization information to standard output for the
 # pi : report the palettization information to standard output for the
 # user's perusal.
 # user's perusal.
 #
 #
 pi :
 pi :
-	egg-palettize $[PALETTIZE_OPTS] -a $[texattrib_file] -pi
+        egg-palettize $[PALETTIZE_OPTS] -a $[texattrib_file] -pi
 
 
 #
 #
 # pal-stats : report palettization statistics to standard output for the
 # pal-stats : report palettization statistics to standard output for the
 # user's perusal.
 # user's perusal.
 #
 #
 pal-stats :
 pal-stats :
-	egg-palettize $[PALETTIZE_OPTS] -a $[texattrib_file] -s
+        egg-palettize $[PALETTIZE_OPTS] -a $[texattrib_file] -s
 stats-pal : pal-stats
 stats-pal : pal-stats
 
 
 // Somehow, something in the cttools confuses some shells, so that
 // Somehow, something in the cttools confuses some shells, so that
@@ -463,82 +463,82 @@ stats-pal : pal-stats
 
 
 #formap dirname subdirs
 #formap dirname subdirs
 $[dirname] : $[dirnames $[if $[build_directory],$[DIRNAME]],$[DEPEND_DIRS]]
 $[dirname] : $[dirnames $[if $[build_directory],$[DIRNAME]],$[DEPEND_DIRS]]
-	cd ./$[PATH] && $(MAKE) all
+        cd ./$[PATH] && $(MAKE) all
 #end dirname
 #end dirname
 
 
 #formap dirname subdirs
 #formap dirname subdirs
 egg-$[dirname] :
 egg-$[dirname] :
-	cd ./$[PATH] && $(MAKE) egg
+        cd ./$[PATH] && $(MAKE) egg
 #end dirname
 #end dirname
 
 
 #formap dirname subdirs
 #formap dirname subdirs
 bam-$[dirname] :
 bam-$[dirname] :
-	cd ./$[PATH] && $(MAKE) bam
+        cd ./$[PATH] && $(MAKE) bam
 #end dirname
 #end dirname
 
 
 #formap dirname subdirs
 #formap dirname subdirs
 pal-$[dirname] :
 pal-$[dirname] :
-	cd ./$[PATH] && $(MAKE) pal
+        cd ./$[PATH] && $(MAKE) pal
 #end dirname
 #end dirname
 
 
 #formap dirname subdirs
 #formap dirname subdirs
 clean-bam-$[dirname] :
 clean-bam-$[dirname] :
-	cd ./$[PATH] && $(MAKE) clean-bam
+        cd ./$[PATH] && $(MAKE) clean-bam
 #end dirname
 #end dirname
 
 
 #formap dirname subdirs
 #formap dirname subdirs
 clean-pal-$[dirname] :
 clean-pal-$[dirname] :
-	cd ./$[PATH] && $(MAKE) clean-pal
+        cd ./$[PATH] && $(MAKE) clean-pal
 #end dirname
 #end dirname
 
 
 #formap dirname subdirs
 #formap dirname subdirs
 clean-$[dirname] :
 clean-$[dirname] :
-	cd ./$[PATH] && $(MAKE) clean
+        cd ./$[PATH] && $(MAKE) clean
 #end dirname
 #end dirname
 
 
 #formap dirname subdirs
 #formap dirname subdirs
 cleanall-$[dirname] :
 cleanall-$[dirname] :
-	cd ./$[PATH] && $(MAKE) cleanall
+        cd ./$[PATH] && $(MAKE) cleanall
 #end dirname
 #end dirname
 
 
 #formap dirname subdirs
 #formap dirname subdirs
 install-egg-$[dirname] :
 install-egg-$[dirname] :
-	cd ./$[PATH] && $(MAKE) install-egg
+        cd ./$[PATH] && $(MAKE) install-egg
 #end dirname
 #end dirname
 
 
 #formap dirname subdirs
 #formap dirname subdirs
 install-bam-$[dirname] :
 install-bam-$[dirname] :
-	cd ./$[PATH] && $(MAKE) install-bam
+        cd ./$[PATH] && $(MAKE) install-bam
 #end dirname
 #end dirname
 
 
 #formap dirname subdirs
 #formap dirname subdirs
 install-other-$[dirname] :
 install-other-$[dirname] :
-	cd ./$[PATH] && $(MAKE) install-other
+        cd ./$[PATH] && $(MAKE) install-other
 #end dirname
 #end dirname
 
 
 #formap dirname subdirs
 #formap dirname subdirs
 install-$[dirname] : 
 install-$[dirname] : 
-	cd ./$[PATH] && $(MAKE) install
+        cd ./$[PATH] && $(MAKE) install
 #end dirname
 #end dirname
 
 
 #formap dirname subdirs
 #formap dirname subdirs
 uninstall-egg-$[dirname] :
 uninstall-egg-$[dirname] :
-	cd ./$[PATH] && $(MAKE) uninstall-egg
+        cd ./$[PATH] && $(MAKE) uninstall-egg
 #end dirname
 #end dirname
 
 
 #formap dirname subdirs
 #formap dirname subdirs
 uninstall-bam-$[dirname] :
 uninstall-bam-$[dirname] :
-	cd ./$[PATH] && $(MAKE) uninstall-bam
+        cd ./$[PATH] && $(MAKE) uninstall-bam
 #end dirname
 #end dirname
 
 
 #formap dirname subdirs
 #formap dirname subdirs
 uninstall-other-$[dirname] :
 uninstall-other-$[dirname] :
-	cd ./$[PATH] && $(MAKE) uninstall-other
+        cd ./$[PATH] && $(MAKE) uninstall-other
 #end dirname
 #end dirname
 
 
 #formap dirname subdirs
 #formap dirname subdirs
 uninstall-$[dirname] :
 uninstall-$[dirname] :
-	cd ./$[PATH] && $(MAKE) uninstall
+        cd ./$[PATH] && $(MAKE) uninstall
 #end dirname
 #end dirname
 
 
 #end Makefile
 #end Makefile

+ 12 - 12
dtool/pptempl/Template.stopgap.pp

@@ -129,22 +129,22 @@ include $(DTOOL)/include/Makefile.install.rules
 
 
 #### Install actions for OTHER files (source must be in $(PKGROOT)):
 #### Install actions for OTHER files (source must be in $(PKGROOT)):
 # [ installed file ] : $(PKGROOT)/[ source file ]  # Files must have same name
 # [ installed file ] : $(PKGROOT)/[ source file ]  # Files must have same name
-#	$(INSTALL)                      # Copies from source to dest
+#       $(INSTALL)                      # Copies from source to dest
 #
 #
 # [ installed file ] : $(PKGROOT)/[ source file ]
 # [ installed file ] : $(PKGROOT)/[ source file ]
-#	$(MKINSTALL)			# Also makes directory if needed
+#       $(MKINSTALL)                    # Also makes directory if needed
 
 
 #if $[ne $[INSTALL_PARSER_INC],]
 #if $[ne $[INSTALL_PARSER_INC],]
 $(INST_PARSER_INC) : include/parser-inc/% : $(PKGROOT)/%
 $(INST_PARSER_INC) : include/parser-inc/% : $(PKGROOT)/%
-	$(MKINSTALL)
+        $(MKINSTALL)
 #endif
 #endif
 
 
 #### Other install/uninstall actions:
 #### Other install/uninstall actions:
 # install-$(PKGROOT): #Add dependencies here
 # install-$(PKGROOT): #Add dependencies here
-#	Add actions here
+#       Add actions here
 #
 #
 # uninstall-$(PKGROOT): #Add dependencies here
 # uninstall-$(PKGROOT): #Add dependencies here
-#	Add actions here
+#       Add actions here
 
 
 #### Sub-package Makefile.install inclusions:
 #### Sub-package Makefile.install inclusions:
 # include foo/Makefile.install
 # include foo/Makefile.install
@@ -431,13 +431,13 @@ include $(DTOOL)/include/Makefile.bin.rules
 #### This is a special makefile just to generate the $[TARGET] script.
 #### This is a special makefile just to generate the $[TARGET] script.
 
 
 $[TARGET] : $[SOURCE]
 $[TARGET] : $[SOURCE]
-	sed $[COMMAND] $^ >$@
-	chmod +x $@
+        sed $[COMMAND] $^ >$@
+        chmod +x $@
 
 
 clean :
 clean :
 
 
 cleanall :
 cleanall :
-	rm -f $[TARGET]
+        rm -f $[TARGET]
 #end Makefile.$[TARGET]
 #end Makefile.$[TARGET]
 #end sed_bin_target
 #end sed_bin_target
 
 
@@ -531,17 +531,17 @@ include $(DTOOL)/include/Makefile.install.rules
 
 
 #### Install actions for OTHER files (source must be in $(PKGROOT)):
 #### Install actions for OTHER files (source must be in $(PKGROOT)):
 # [ installed file ] : $(PKGROOT)/[ source file ]  # Files must have same name
 # [ installed file ] : $(PKGROOT)/[ source file ]  # Files must have same name
-#	$(INSTALL)                      # Copies from source to dest
+#       $(INSTALL)                      # Copies from source to dest
 #
 #
 # [ installed file ] : $(PKGROOT)/[ source file ]
 # [ installed file ] : $(PKGROOT)/[ source file ]
-#	$(MKINSTALL)			# Also makes directory if needed
+#       $(MKINSTALL)                    # Also makes directory if needed
 
 
 #### Other install/uninstall actions:
 #### Other install/uninstall actions:
 # install-$(PKGROOT): #Add dependencies here
 # install-$(PKGROOT): #Add dependencies here
-#	Add actions here
+#       Add actions here
 #
 #
 # uninstall-$(PKGROOT): #Add dependencies here
 # uninstall-$(PKGROOT): #Add dependencies here
-#	Add actions here
+#       Add actions here
 
 
 #### Sub-package Makefile.install inclusions:
 #### Sub-package Makefile.install inclusions:
 # include foo/Makefile.install
 # include foo/Makefile.install

+ 21 - 21
dtool/src/cppparser/Sources.pp

@@ -4,29 +4,29 @@
 #begin static_lib_target
 #begin static_lib_target
   #define TARGET cppParser
   #define TARGET cppParser
   
   
-  #define SOURCES							  \
+  #define SOURCES                                                         \
     cppArrayType.cxx cppArrayType.h \
     cppArrayType.cxx cppArrayType.h \
-    cppBison.yxx cppBisonDefs.h						  \
-    cppClassTemplateParameter.cxx cppClassTemplateParameter.h		  \
-    cppCommentBlock.cxx cppCommentBlock.h cppConstType.cxx		  \
-    cppConstType.h cppDeclaration.cxx cppDeclaration.h cppEnumType.cxx	  \
-    cppEnumType.h cppExpression.cxx cppExpression.h			  \
-    cppExpressionParser.cxx cppExpressionParser.h cppExtensionType.cxx	  \
-    cppExtensionType.h cppFile.cxx cppFile.h cppFunctionGroup.cxx	  \
-    cppFunctionGroup.h cppFunctionType.cxx cppFunctionType.h		  \
-    cppGlobals.cxx cppGlobals.h cppIdentifier.cxx cppIdentifier.h	  \
-    cppInstance.cxx cppInstance.h cppInstanceIdentifier.cxx		  \
-    cppInstanceIdentifier.h cppManifest.cxx cppManifest.h		  \
-    cppNameComponent.cxx cppNameComponent.h cppNamespace.cxx		  \
+    cppBison.yxx cppBisonDefs.h                                           \
+    cppClassTemplateParameter.cxx cppClassTemplateParameter.h             \
+    cppCommentBlock.cxx cppCommentBlock.h cppConstType.cxx                \
+    cppConstType.h cppDeclaration.cxx cppDeclaration.h cppEnumType.cxx    \
+    cppEnumType.h cppExpression.cxx cppExpression.h                       \
+    cppExpressionParser.cxx cppExpressionParser.h cppExtensionType.cxx    \
+    cppExtensionType.h cppFile.cxx cppFile.h cppFunctionGroup.cxx         \
+    cppFunctionGroup.h cppFunctionType.cxx cppFunctionType.h              \
+    cppGlobals.cxx cppGlobals.h cppIdentifier.cxx cppIdentifier.h         \
+    cppInstance.cxx cppInstance.h cppInstanceIdentifier.cxx               \
+    cppInstanceIdentifier.h cppManifest.cxx cppManifest.h                 \
+    cppNameComponent.cxx cppNameComponent.h cppNamespace.cxx              \
     cppNamespace.h cppParameterList.cxx cppParameterList.h cppParser.cxx  \
     cppNamespace.h cppParameterList.cxx cppParameterList.h cppParser.cxx  \
-    cppParser.h cppPointerType.cxx cppPointerType.h cppPreprocessor.cxx	  \
-    cppPreprocessor.h cppReferenceType.cxx cppReferenceType.h		  \
-    cppScope.cxx cppScope.h cppSimpleType.cxx cppSimpleType.h		  \
-    cppStructType.cxx cppStructType.h cppTBDType.cxx cppTBDType.h	  \
-    cppTemplateParameterList.cxx cppTemplateParameterList.h		  \
-    cppTemplateScope.cxx cppTemplateScope.h cppToken.cxx cppToken.h	  \
-    cppType.cxx cppType.h cppTypeDeclaration.cxx cppTypeDeclaration.h	  \
-    cppTypeParser.cxx cppTypeParser.h cppTypeProxy.cxx cppTypeProxy.h	  \
+    cppParser.h cppPointerType.cxx cppPointerType.h cppPreprocessor.cxx   \
+    cppPreprocessor.h cppReferenceType.cxx cppReferenceType.h             \
+    cppScope.cxx cppScope.h cppSimpleType.cxx cppSimpleType.h             \
+    cppStructType.cxx cppStructType.h cppTBDType.cxx cppTBDType.h         \
+    cppTemplateParameterList.cxx cppTemplateParameterList.h               \
+    cppTemplateScope.cxx cppTemplateScope.h cppToken.cxx cppToken.h       \
+    cppType.cxx cppType.h cppTypeDeclaration.cxx cppTypeDeclaration.h     \
+    cppTypeParser.cxx cppTypeParser.h cppTypeProxy.cxx cppTypeProxy.h     \
     cppTypedef.cxx cppTypedef.h cppUsing.cxx cppUsing.h cppVisibility.cxx \
     cppTypedef.cxx cppTypedef.h cppUsing.cxx cppUsing.h cppVisibility.cxx \
     cppVisibility.h indent.cxx indent.h
     cppVisibility.h indent.cxx indent.h
 
 

+ 6 - 6
dtool/src/dconfig/Sources.pp

@@ -12,12 +12,12 @@
     notifySeverity.cxx notifySeverity.h serialization.I serialization.h  \
     notifySeverity.cxx notifySeverity.h serialization.I serialization.h  \
     symbolEnt.I symbolEnt.cxx symbolEnt.h
     symbolEnt.I symbolEnt.cxx symbolEnt.h
 
 
-  #define INSTALL_HEADERS						\
-    configTable.I configTable.h config_dconfig.h config_setup.h		\
-    dconfig.I dconfig.h							\
-    expand.I expand.h notify.I notify.h notifyCategory.I		\
-    notifyCategory.h notifyCategoryProxy.I notifyCategoryProxy.h	\
-    notifySeverity.h serialization.I serialization.h symbolEnt.I	\
+  #define INSTALL_HEADERS                                               \
+    configTable.I configTable.h config_dconfig.h config_setup.h         \
+    dconfig.I dconfig.h                                                 \
+    expand.I expand.h notify.I notify.h notifyCategory.I                \
+    notifyCategory.h notifyCategoryProxy.I notifyCategoryProxy.h        \
+    notifySeverity.h serialization.I serialization.h symbolEnt.I        \
     symbolEnt.h
     symbolEnt.h
 
 
 #end lib_target
 #end lib_target

+ 6 - 6
dtool/src/dtoolutil/Sources.pp

@@ -4,16 +4,16 @@
   #define UNIX_SYS_LIBS dl
   #define UNIX_SYS_LIBS dl
   
   
   #define SOURCES \
   #define SOURCES \
-    executionEnvironment.I executionEnvironment.cxx			\
-    executionEnvironment.h filename.I filename.cxx filename.h		\
-    load_dso.cxx load_dso.h dSearchPath.I dSearchPath.cxx		\
-    dSearchPath.h pfstream.h vector_string.cxx vector_string.h	        \
+    executionEnvironment.I executionEnvironment.cxx                     \
+    executionEnvironment.h filename.I filename.cxx filename.h           \
+    load_dso.cxx load_dso.h dSearchPath.I dSearchPath.cxx               \
+    dSearchPath.h pfstream.h vector_string.cxx vector_string.h          \
     gnu_getopt.c gnu_getopt.h gnu_getopt1.c pfstreamBuf.h pfstreamBuf.cxx \
     gnu_getopt.c gnu_getopt.h gnu_getopt1.c pfstreamBuf.h pfstreamBuf.cxx \
     pfstream.cxx vector_src.h
     pfstream.cxx vector_src.h
 
 
   #define INSTALL_HEADERS \
   #define INSTALL_HEADERS \
-    executionEnvironment.I executionEnvironment.h filename.I	\
-    filename.h load_dso.h dSearchPath.I dSearchPath.h	\
+    executionEnvironment.I executionEnvironment.h filename.I    \
+    filename.h load_dso.h dSearchPath.I dSearchPath.h   \
     pfstream.h pfstream.I vector_string.h gnu_getopt.h \
     pfstream.h pfstream.I vector_string.h gnu_getopt.h \
     pfstreamBuf.h \
     pfstreamBuf.h \
     vector_src.cxx vector_src.h
     vector_src.cxx vector_src.h

+ 21 - 21
dtool/src/interrogate/Sources.pp

@@ -4,27 +4,27 @@
   #define TARGET interrogate
   #define TARGET interrogate
 
 
   #define SOURCES \
   #define SOURCES \
-    interrogate.cxx interrogate.h					\
-    interrogateBuilder.cxx interrogateBuilder.h				\
-    parameterRemap.I parameterRemap.cxx parameterRemap.h			\
-    parameterRemapBasicStringRefToString.cxx				\
-    parameterRemapBasicStringRefToString.h				\
-    parameterRemapBasicStringToString.cxx				\
-    parameterRemapBasicStringToString.h					\
-    parameterRemapCharStarToString.cxx parameterRemapCharStarToString.h	\
-    parameterRemapConcreteToPointer.cxx					\
-    parameterRemapConcreteToPointer.h parameterRemapConstToNonConst.cxx	\
-    parameterRemapConstToNonConst.h parameterRemapEnumToInt.cxx		\
-    parameterRemapEnumToInt.h parameterRemapPTToPointer.cxx		\
-    parameterRemapPTToPointer.h parameterRemapReferenceToConcrete.cxx	\
-    parameterRemapReferenceToConcrete.h					\
-    parameterRemapReferenceToPointer.cxx					\
-    parameterRemapReferenceToPointer.h parameterRemapThis.cxx		\
-    parameterRemapThis.h parameterRemapToString.cxx			\
-    parameterRemapToString.h parameterRemapUnchanged.cxx			\
-    parameterRemapUnchanged.h typeManager.cxx				\
-    typeManager.h wrapperBuilder.cxx wrapperBuilder.h			\
-    wrapperBuilderC.cxx wrapperBuilderC.h wrapperBuilderPython.cxx	\
+    interrogate.cxx interrogate.h                                       \
+    interrogateBuilder.cxx interrogateBuilder.h                         \
+    parameterRemap.I parameterRemap.cxx parameterRemap.h                        \
+    parameterRemapBasicStringRefToString.cxx                            \
+    parameterRemapBasicStringRefToString.h                              \
+    parameterRemapBasicStringToString.cxx                               \
+    parameterRemapBasicStringToString.h                                 \
+    parameterRemapCharStarToString.cxx parameterRemapCharStarToString.h \
+    parameterRemapConcreteToPointer.cxx                                 \
+    parameterRemapConcreteToPointer.h parameterRemapConstToNonConst.cxx \
+    parameterRemapConstToNonConst.h parameterRemapEnumToInt.cxx         \
+    parameterRemapEnumToInt.h parameterRemapPTToPointer.cxx             \
+    parameterRemapPTToPointer.h parameterRemapReferenceToConcrete.cxx   \
+    parameterRemapReferenceToConcrete.h                                 \
+    parameterRemapReferenceToPointer.cxx                                        \
+    parameterRemapReferenceToPointer.h parameterRemapThis.cxx           \
+    parameterRemapThis.h parameterRemapToString.cxx                     \
+    parameterRemapToString.h parameterRemapUnchanged.cxx                        \
+    parameterRemapUnchanged.h typeManager.cxx                           \
+    typeManager.h wrapperBuilder.cxx wrapperBuilder.h                   \
+    wrapperBuilderC.cxx wrapperBuilderC.h wrapperBuilderPython.cxx      \
     wrapperBuilderPython.h
     wrapperBuilderPython.h
 
 
 #end bin_target
 #end bin_target

+ 13 - 13
dtool/src/interrogatedb/Sources.pp

@@ -4,19 +4,19 @@
   #define TARGET interrogatedb
   #define TARGET interrogatedb
   
   
   #define SOURCES \
   #define SOURCES \
-    config_interrogatedb.cxx config_interrogatedb.h indexRemapper.cxx	\
-    indexRemapper.h interrogateComponent.I interrogateComponent.cxx	\
-    interrogateComponent.h interrogateDatabase.I			\
-    interrogateDatabase.cxx interrogateDatabase.h interrogateElement.I	\
-    interrogateElement.cxx interrogateElement.h interrogateFunction.I	\
-    interrogateFunction.cxx interrogateFunction.h			\
-    interrogateFunctionWrapper.I interrogateFunctionWrapper.cxx		\
-    interrogateFunctionWrapper.h interrogateManifest.I			\
-    interrogateManifest.cxx interrogateManifest.h interrogateType.I	\
-    interrogateType.cxx interrogateType.h interrogate_datafile.I		\
-    interrogate_datafile.cxx interrogate_datafile.h			\
-    interrogate_interface.cxx interrogate_interface.h			\
-    interrogate_request.cxx interrogate_request.h vector_int.cxx		\
+    config_interrogatedb.cxx config_interrogatedb.h indexRemapper.cxx   \
+    indexRemapper.h interrogateComponent.I interrogateComponent.cxx     \
+    interrogateComponent.h interrogateDatabase.I                        \
+    interrogateDatabase.cxx interrogateDatabase.h interrogateElement.I  \
+    interrogateElement.cxx interrogateElement.h interrogateFunction.I   \
+    interrogateFunction.cxx interrogateFunction.h                       \
+    interrogateFunctionWrapper.I interrogateFunctionWrapper.cxx         \
+    interrogateFunctionWrapper.h interrogateManifest.I                  \
+    interrogateManifest.cxx interrogateManifest.h interrogateType.I     \
+    interrogateType.cxx interrogateType.h interrogate_datafile.I                \
+    interrogate_datafile.cxx interrogate_datafile.h                     \
+    interrogate_interface.cxx interrogate_interface.h                   \
+    interrogate_request.cxx interrogate_request.h vector_int.cxx                \
     vector_int.h
     vector_int.h
 
 
   #define INSTALL_HEADERS \
   #define INSTALL_HEADERS \

+ 9 - 9
panda/src/event/Sources.pp

@@ -5,18 +5,18 @@
 #begin lib_target
 #begin lib_target
   #define TARGET event
   #define TARGET event
   
   
-  #define SOURCES							\
+  #define SOURCES                                                       \
     config_event.cxx config_event.h \
     config_event.cxx config_event.h \
-    event.I event.cxx event.h eventHandler.cxx	\
-    eventHandler.h eventParameter.I eventParameter.cxx			\
-    eventParameter.h eventQueue.I eventQueue.cxx eventQueue.h		\
-    eventReceiver.cxx eventReceiver.h pt_Event.cxx pt_Event.h		\
+    event.I event.cxx event.h eventHandler.cxx  \
+    eventHandler.h eventParameter.I eventParameter.cxx                  \
+    eventParameter.h eventQueue.I eventQueue.cxx eventQueue.h           \
+    eventReceiver.cxx eventReceiver.h pt_Event.cxx pt_Event.h           \
     throw_event.I throw_event.h
     throw_event.I throw_event.h
 
 
-  #define INSTALL_HEADERS					\
-    event.I event.h eventHandler.h eventParameter.I eventParameter.h	\
-    eventQueue.h eventQueue.I throw_event.h throw_event.I	\
-    eventReceiver.h						\
+  #define INSTALL_HEADERS                                       \
+    event.I event.h eventHandler.h eventParameter.I eventParameter.h    \
+    eventQueue.h eventQueue.I throw_event.h throw_event.I       \
+    eventReceiver.h                                             \
     pt_Event.h
     pt_Event.h
 
 
   #define IGATESCAN all
   #define IGATESCAN all

+ 3 - 3
panda/src/ipc/Sources.pp

@@ -8,14 +8,14 @@
 #begin lib_target
 #begin lib_target
   #define TARGET ipc
   #define TARGET ipc
   
   
-  #define SOURCES							\
+  #define SOURCES                                                       \
     ipc.cxx ipc_atomics.h ipc_condition.h ipc_file.I ipc_file.h \
     ipc.cxx ipc_atomics.h ipc_condition.h ipc_file.I ipc_file.h \
     ipc_library.h ipc_mach_traits.h ipc_mutex.h ipc_nspr_traits.h \
     ipc_library.h ipc_mach_traits.h ipc_mutex.h ipc_nspr_traits.h \
     ipc_nt_traits.h ipc_posix_traits.h \
     ipc_nt_traits.h ipc_posix_traits.h \
     ipc_ps2_traits.h ipc_semaphore.h ipc_solaris_traits.h ipc_thread.h \
     ipc_ps2_traits.h ipc_semaphore.h ipc_solaris_traits.h ipc_thread.h \
     ipc_traits.cxx ipc_traits.h
     ipc_traits.cxx ipc_traits.h
 
 
-  #define INSTALL_HEADERS					\
+  #define INSTALL_HEADERS                                       \
     ipc_mutex.h ipc_condition.h ipc_semaphore.h ipc_thread.h \
     ipc_mutex.h ipc_condition.h ipc_semaphore.h ipc_thread.h \
     ipc_traits.h ipc_mach_traits.h ipc_nt_traits.h ipc_posix_traits.h \
     ipc_traits.h ipc_mach_traits.h ipc_nt_traits.h ipc_posix_traits.h \
     ipc_solaris_traits.h ipc_nspr_traits.h ipc_ps2_traits.h \
     ipc_solaris_traits.h ipc_nspr_traits.h ipc_ps2_traits.h \
@@ -33,7 +33,7 @@
 #begin test_bin_target
 #begin test_bin_target
   #define TARGET loom
   #define TARGET loom
   
   
-  #define SOURCES							\
+  #define SOURCES                                                       \
     loom.cxx loom.h loom_internal.h
     loom.cxx loom.h loom_internal.h
 
 
   #define LOCAL_LIBS ipc $[LOCAL_LIBS]
   #define LOCAL_LIBS ipc $[LOCAL_LIBS]

+ 1 - 1
panda/src/sgraphutil/Sources.pp

@@ -1,6 +1,6 @@
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
                    dtoolutil:c dtoolbase:c dtool:m
                    dtoolutil:c dtoolbase:c dtool:m
-				   
+
 #begin lib_target
 #begin lib_target
   #define TARGET sgraphutil
   #define TARGET sgraphutil
   #define LOCAL_LIBS \
   #define LOCAL_LIBS \

+ 1 - 1
panda/src/tform/Sources.pp

@@ -1,6 +1,6 @@
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
                    dtoolutil:c dtoolbase:c dtool:m
                    dtoolutil:c dtoolbase:c dtool:m
-				   
+
 #begin lib_target
 #begin lib_target
   #define TARGET tform
   #define TARGET tform
   #define LOCAL_LIBS \
   #define LOCAL_LIBS \