Changeset 3011 for trunk/src

Timestamp:

Mar 4, 2000, 9:03:43 PM (25 years ago)

Author:

bird

Message:

We don't have to set NODEP=1 when making dep for subdirectories.
It's a part of the MAKE_CMD macro when initially defined.

Location:

trunk/src/opengl

Files:

• glide/cvg/makefile (modified) (3 diffs)
• glide/makefile (modified) (2 diffs)
• glide/sst1/init/makefile (modified) (3 diffs)
• glide/sst1/makefile (modified) (3 diffs)
• makefile (modified) (2 diffs)

trunk/src/opengl/glide/cvg/makefile

@@ -1 @@
-# $Id: makefile,v 1.5 2000-03-01 14:26:49 sandervl Exp $
+# $Id: makefile,v 1.6 2000-03-04 20:03:43 bird Exp $
 #
 # PD-Win32 API
@@ -18 +18 @@
 CXXFLAGS = $(CXXFLAGS)  -I$(PDWIN32_INCLUDE)
 
-OBJS =  initterm.obj \
-        glideres.obj \
-        ..\swlibs\pcilib\pcilib.lib \
-        texus\texus.lib \
-        init\init.lib \
+OBJS =  initterm.obj \
+        glideres.obj \
+        ..\swlibs\pcilib\pcilib.lib \
+        texus\texus.lib \
+        init\init.lib \
         glide\glide.lib \
- 
+
 all: ..\swlibs\pcilib\pcilib.lib init\init.lib texus\texus.lib glide\glide.lib $(TARGET).dll $(TARGET).lib
 
@@ -73 +73 @@
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
     cd ..\swlibs\pcilib
-    $(MAKE_CMD) NODEP=1 dep
+    $(MAKE_CMD) dep
     cd ..\..\cvg\glide
-    $(MAKE_CMD) NODEP=1 dep
+    $(MAKE_CMD) dep
     cd ..\init
-    $(MAKE_CMD) NODEP=1 dep
+    $(MAKE_CMD) dep
     cd ..\texus
-    $(MAKE_CMD) NODEP=1 dep
+    $(MAKE_CMD) dep
     cd ..
 

trunk/src/opengl/glide/makefile

@@ -1 @@
-# $Id: makefile,v 1.2 2000-02-25 00:39:57 sandervl Exp $
+# $Id: makefile,v 1.3 2000-03-04 20:03:42 bird Exp $
 #
 # PD-Win32 API
@@ -44 +44 @@
 dep:
     cd cvg
-    $(MAKE_CMD) NODEP=1 dep
+    $(MAKE_CMD) dep
     cd ..\sst1
-    $(MAKE_CMD) NODEP=1 dep
+    $(MAKE_CMD) dep
     cd ..
 

trunk/src/opengl/glide/sst1/init/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 2000-02-25 00:31:27 sandervl Exp $
+# $Id: makefile,v 1.2 2000-03-04 20:03:43 bird Exp $
 #
 # PD-Win32 API
@@ -22 +22 @@
 CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
 
-OBJS =  H3DRVR.OBJ      INIT.OBJ        VG96DRVR.OBJ    VGDRVR.OBJ \
-        $(TARGET2)\DAC.OBJ         $(TARGET2)\GAMMA.OBJ       $(TARGET2)\GDEBUG.OBJ      $(TARGET2)\INFO.OBJ        $(TARGET2)\PARSE.OBJ \
-        $(TARGET2)\PRINT.OBJ       $(TARGET2)\SLI.OBJ         $(TARGET2)\SST1INIT.OBJ    $(TARGET2)\UTIL.OBJ        $(TARGET2)\VIDEO.OBJ
+OBJS =  H3DRVR.OBJ      INIT.OBJ        VG96DRVR.OBJ    VGDRVR.OBJ \
+        $(TARGET2)\DAC.OBJ         $(TARGET2)\GAMMA.OBJ       $(TARGET2)\GDEBUG.OBJ      $(TARGET2)\INFO.OBJ        $(TARGET2)\PARSE.OBJ \
+        $(TARGET2)\PRINT.OBJ       $(TARGET2)\SLI.OBJ         $(TARGET2)\SST1INIT.OBJ    $(TARGET2)\UTIL.OBJ        $(TARGET2)\VIDEO.OBJ
 
 all: $(TARGET2).lib $(TARGET1).lib
 
 $(TARGET1).lib: $(OBJS)
-        $(RM) $(TARGET1).lib
-        $(ILIB) $(ILIBFLAGS) $(TARGET1).lib $(OBJS),,
+        $(RM) $(TARGET1).lib
+        $(ILIB) $(ILIBFLAGS) $(TARGET1).lib $(OBJS),,
 
 
@@ -41 +41 @@
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
-        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h initvg\*.h ..\glide\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h 
+        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h initvg\*.h ..\glide\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h
     cd initvg
-    $(MAKE_CMD) NODEP=1 dep
+    $(MAKE_CMD) dep
 
 !ifndef NODEP

trunk/src/opengl/glide/sst1/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 2000-02-25 00:31:07 sandervl Exp $
+# $Id: makefile,v 1.2 2000-03-04 20:03:43 bird Exp $
 #
 # PD-Win32 API
@@ -18 +18 @@
 CXXFLAGS = $(CXXFLAGS)  -I$(PDWIN32_INCLUDE)
 
-OBJS =  initterm.obj \
-        glideres.obj \
-        ..\swlibs\pcilib\pcilib.lib \
-        texus\texus.lib \
-        init\init.lib \
+OBJS =  initterm.obj \
+        glideres.obj \
+        ..\swlibs\pcilib\pcilib.lib \
+        texus\texus.lib \
+        init\init.lib \
         glide\glide.lib \
- 
+
 all: ..\swlibs\pcilib\pcilib.lib init\init.lib texus\texus.lib glide\glide.lib $(TARGET).dll $(TARGET).lib
 
@@ -73 +73 @@
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
     cd ..\swlibs\pcilib
-    $(MAKE_CMD) NODEP=1 dep
+    $(MAKE_CMD) dep
     cd ..\..\sst1\glide
-    $(MAKE_CMD) NODEP=1 dep
+    $(MAKE_CMD) dep
     cd ..\init
-    $(MAKE_CMD) NODEP=1 dep
+    $(MAKE_CMD) dep
     cd ..\texus
-    $(MAKE_CMD) NODEP=1 dep
+    $(MAKE_CMD) dep
     cd ..
 

trunk/src/opengl/makefile

@@ -1 @@
-# $Id: makefile,v 1.14 2000-03-04 19:10:09 jeroen Exp $
+# $Id: makefile,v 1.15 2000-03-04 20:03:42 bird Exp $
 #
 # PD-Win32 API
@@ -130 +130 @@
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
     cd glut
-    $(MAKE_CMD) NODEP=1 dep
+    $(MAKE_CMD) dep
     cd ..\glu
-    $(MAKE_CMD) NODEP=1 dep
+    $(MAKE_CMD) dep
     cd ..\glide
-    $(MAKE_CMD) NODEP=1 dep
+    $(MAKE_CMD) dep
     cd ..\mesa
-    $(MAKE_CMD) NODEP=1 dep
+    $(MAKE_CMD) dep
     cd 3dfx
-    $(MAKE_CMD) NODEP=1 dep
+    $(MAKE_CMD) dep
     cd ..\..