Changeset 4712 for trunk/tools/database

Timestamp:

Dec 3, 2000, 12:27:03 AM (25 years ago)

Author:

bird

Message:

New makefile style.

Location:

trunk/tools/database

Files:

• Makefile (modified) (7 diffs)
• gd/Makefile (modified) (1 diff)
• gd/Makefile.gcc (modified) (1 diff)
• gd/Makefile.icc (modified) (1 diff)
• makefile.gcc (modified) (4 diffs)

trunk/tools/database/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.14 2000-09-28 03:06:27 bird Exp $
+# $Id: Makefile,v 1.15 2000-12-02 23:26:58 bird Exp $
 
 #
@@ -6 +6 @@
 
 # include common definitions
-PDWIN32_INCLUDE = ..\..\include
-PDWIN32_TOOLS   = ..\bin
-!include ..\..\include\pdwin32.mk
+ODIN32_TCOMMON = ..\common
+ODIN32_BIN     = $(ODIN32_TOOLS)
+!include ../../makefile.inc
+!include $(ODIN32_TCOMMON)/common.mk
 
 # Addjust common definitions
-CINCLUDES= -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win -Igd -Imysql -I..\common
+CINCLUDES= -I$(ODIN32_INCLUDE) -I$(ODIN32_INCLUDE)\win -Igd -Imysql -I..\common
 !ifdef DEBUG
 CFLAGS   = $(CFLAGS)   -Ge+ -Tx+ -Tm- $(CINCLUDES)      -DNO_CLIENT_LONG_LONG -Wall+ppt-ppc-inl-cnv-gnr-vft- -Gh+ -DDEBUG_ALLOC
@@ -35 +36 @@
 # APIImport
 #
-APIImport.exe: APIImport.obj db.obj ..\common\commonicc.lib mysql\libmysqlclient.lib
+APIImport.exe: APIImport.obj db.obj $(COMMONLIB) mysql\libmysqlclient.lib
    $(LD) $(LDFLAGS) $**
 
 ..\bin\APIImport.exe: APIImport.exe
    $(CP) $** $@
-
-..\common\commonicc.lib:
-    cd ..\common
-    nmake /nologo commonicc.lib
-    cd ..\database
 
 
@@ -70 +66 @@
 
 gd\gdicc.lib: force
-   @cd gd
-   @nmake /nologo gdicc.lib
-   @cd ..
-
+   $(DODIRS) "gd" $(MAKE_CMD) gdicc.lib
 
 
@@ -111 +104 @@
 #
 dep:
-    $(DEPEND) $(CINCLUDES) -o- *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
+    $(DEPEND) $(CINCLUDES) -o- *.h *.asm *.inc $(ODIN32_INCLUDE)\*.h \
         *.c *.cpp -objo *.c *.cpp
-    cd gd
-    @nmake /nologo dep
-    cd ..
+    $(DODIRS) "gd" $(MAKE_CMD) dep
 
 
@@ -124 +115 @@
 clean:
    $(RM) *.obj *.lib *.o *.a *.dll *.exe *.pch *.log *.map *.html
-   cd gd
-   $(MAKE) /nologo clean
-   cd ..
+    $(DODIRS) "gd" $(MAKE_CMD) clean
 
 
@@ -147 +136 @@
 force:
     @$(ECHO) ...
+
+
+#
+# Common rules.
+#
+!include $(ODIN32_TCOMMON_POST_INC)
+

trunk/tools/database/gd/Makefile

@@ -11 +11 @@
 all: gdgcc.a gdgcc.lib gdicc.lib
 
-PDWIN32_TOOLS = ..\..\bin
-PDWIN32_INCLUDE = ..\..\..\include
-!include ..\..\..\include\pdwin32.tools
+ODIN32_TOOLS = ../../bin
+!include ../../../makefile.inc
 
 gdgcc.a: force

trunk/tools/database/gd/Makefile.gcc

@@ -8 +8 @@
 #for your system.
 
-PDWIN32_INCLUDE = ..\..\..\include
-PDWIN32_TOOLS = ..\..\bin
-!include $(PDWIN32_INCLUDE)\pdwin32.mk
+ODIN32_TOOLS    = ..\..\bin
+!include ../../../makefile.inc
 
 CC=gcc

trunk/tools/database/gd/Makefile.icc

@@ -9 +9 @@
 
 
-PDWIN32_INCLUDE = ..\..\..\include
-PDWIN32_TOOLS = ..\..\bin
-!include $(PDWIN32_INCLUDE)\pdwin32.mk
+ODIN32_TOOLS = ..\..\bin
+!include ../../../makefile.inc
 
 

trunk/tools/database/makefile.gcc

@@ -1 @@
-# $Id: makefile.gcc,v 1.2 2000-02-12 23:54:30 bird Exp $
+# $Id: makefile.gcc,v 1.3 2000-12-02 23:26:59 bird Exp $
 
 #
@@ -6 +6 @@
 
 # common include directory
-PDWIN32_INCLUDE = ..\..\include
-PDWIN32_TOOLS = ..\bin
-!include $(PDWIN32_INCLUDE)\pdwin32.tools
+ODIN32_INCLUDE = ..\..\include
+ODIN32_TOOLS = ..\bin
+!include $(ODIN32_INCLUDE)\odin32.tools
 
 !ifndef OMF
@@ -34 +34 @@
 
 CDEFINES  = -D__WIN32OS2__ -D__WINE__ -DNOTDLL
-CINCLUDES = -I$(PDWIN32_INCLUDE)\Win -I$(PDWIN32_INCLUDE) -Imysql -Igd -I..\common
+CINCLUDES = -I$(ODIN32_INCLUDE)\Win -I$(ODIN32_INCLUDE) -Imysql -Igd -I..\common
 # Note: Add -fhandle-exceptions if old gcc version.
 !ifndef DEBUG
@@ -159 +159 @@
 #
 dep:
-    $(DEPEND) $(CINCLUDES) *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
+    $(DEPEND) $(CINCLUDES) *.h *.asm *.inc $(ODIN32_INCLUDE)\*.h \
         *.c *.cpp -objo *.c *.cpp
     cd gd