Makefile tweaks

diff --git a/AssemTris/Makefile.in b/AssemTris/Makefile.in
index dca0e004b14a12fa50812a2b619e2f82b13575af..73b4d0299be3a621bac3686ec7bf3f10c54bc9db 100644 (file)
--- a/AssemTris/Makefile.in
+++ b/AssemTris/Makefile.in
@@ -344,8 +344,8 @@ INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
 
 #---------------------------------------------------------------------------
 # $Log$
-# Revision 1.11  1998/05/13 18:30:14  curt
-# Updated ...
+# Revision 1.12  1998/05/20 20:55:44  curt
+# Makefile tweaks
 #
 # Revision 1.2  1998/04/14 02:25:59  curt
 # Code reorganizations.  Added a Lib/ directory for more general libraries.

diff --git a/DemRaw2ascii/Makefile.in b/DemRaw2ascii/Makefile.in
index 111f6cf936576115934e60fb106792a6ad776337..3ffd6cec4f987a2a4856734741b660ecdcb80dd8 100644 (file)
--- a/DemRaw2ascii/Makefile.in
+++ b/DemRaw2ascii/Makefile.in
@@ -343,8 +343,8 @@ INCLUDES +=
 
 #---------------------------------------------------------------------------
 # $Log$
-# Revision 1.9  1998/05/13 18:30:18  curt
-# Updated ...
+# Revision 1.10  1998/05/20 20:55:46  curt
+# Makefile tweaks
 #
 # Revision 1.2  1998/04/24 00:44:04  curt
 # Added zlib support.

diff --git a/FixNode/Makefile.in b/FixNode/Makefile.in
index dbb737c635ec117f2e4c85235b4585fb14c42fa2..909e93f103ba3dd071dc668ccc913dfb12184e4f 100644 (file)
--- a/FixNode/Makefile.in
+++ b/FixNode/Makefile.in
@@ -371,8 +371,8 @@ INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
 
 #---------------------------------------------------------------------------
 # $Log$
-# Revision 1.11  1998/05/13 18:30:19  curt
-# Updated ...
+# Revision 1.12  1998/05/20 20:55:47  curt
+# Makefile tweaks
 #
 # Revision 1.3  1998/04/18 04:02:54  curt
 # Added zlib support in placed and other misc. tweaks.

diff --git a/SplitTris/Makefile.in b/SplitTris/Makefile.in
index 47b374fd4e5215cc4be338aac2318a5907e8f3c0..5f59333c372f356681be63f8f6d7d13bf043f995 100644 (file)
--- a/SplitTris/Makefile.in
+++ b/SplitTris/Makefile.in
@@ -349,8 +349,8 @@ INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
 
 #---------------------------------------------------------------------------
 # $Log$
-# Revision 1.11  1998/05/13 18:30:21  curt
-# Updated ...
+# Revision 1.12  1998/05/20 20:55:49  curt
+# Makefile tweaks
 #
 # Revision 1.4  1998/04/24 00:44:06  curt
 # Added zlib support.

diff --git a/Tools/process-dem.pl b/Tools/process-dem.pl
index 1fa022559176a0d8ba72baea4824ba0c5f33e978..fe7cc3284489bd28185511255b48ec4bfcfba0c3 100755 (executable)
--- a/Tools/process-dem.pl
+++ b/Tools/process-dem.pl
@@ -28,15 +28,15 @@
 
 $| = 1;                         # flush buffers after every write
 
-$do_dem2node =     1;
-$do_triangle_1 = 1;
-$do_fixnode =    1;
-$do_splittris =  1;
-$do_assemtris =  1;
-$do_triangle_2 = 1;
-
-$do_tri2obj =    1;
-$do_strips =     1;
+$do_dem2node =     0;
+$do_triangle_1 = 0;
+$do_fixnode =    0;
+$do_splittris =  0;
+$do_assemtris =  0;
+$do_triangle_2 = 0;
+
+$do_tri2obj =    0;
+$do_strips =     0;
 $do_fixobj =     1;
 
 
@@ -68,7 +68,7 @@ while ( $dem_file = shift(@ARGV) ) {
     if ( $do_dem2node ) {
        dem2node() ;
     } else {
-       $subdir = "../Scenery/w100n040/w093n045";
+       $subdir = "../Scenery/w120n030/w111n033";
        print "WARNING:  Hardcoding subdir = $subdir\n";
     }
 
@@ -380,7 +380,7 @@ sub fixobj {
            }
            close(OUT);
 
-           unlink("$subdir/$file");
+           # unlink("$subdir/$file");
        }
     }
 }
@@ -388,6 +388,9 @@ sub fixobj {
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.18  1998/05/20 20:55:40  curt
+# Makefile tweaks
+#
 # Revision 1.17  1998/04/28 01:23:25  curt
 # Added a work around so that we can get past the "triangle" program
 # hanging, by aborting and rerunning with that tile marked to use the "-i"

diff --git a/Tri2obj/Makefile.in b/Tri2obj/Makefile.in
index 23868cddfaf6922b3a262202b9a08ca07ab41d19..97fe30a0116a504b554fb5ded9ac06d0dbd13b76 100644 (file)
--- a/Tri2obj/Makefile.in
+++ b/Tri2obj/Makefile.in
@@ -349,8 +349,8 @@ INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
 
 #---------------------------------------------------------------------------
 # $Log$
-# Revision 1.11  1998/05/13 18:30:22  curt
-# Updated ...
+# Revision 1.12  1998/05/20 20:55:50  curt
+# Makefile tweaks
 #
 # Revision 1.4  1998/04/24 00:44:07  curt
 # Added zlib support.