Changeset 5530 for trunk/tools/database

Timestamp:

Apr 17, 2001, 2:24:09 AM (24 years ago)

Author:

bird

Message:

Revamped makefiles to fit the new makefile style (finally).

Location:

trunk/tools/database

Files:

• APIImport.def (added)
• APIImport.mak (added)
• Makefile (modified) (2 diffs)
• StateUpd.def (added)
• StateUpd.mak (added)

trunk/tools/database/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.16 2000-12-16 20:10:07 bird Exp $
+# $Id: Makefile,v 1.17 2001-04-17 00:24:09 bird Exp $
 
 #
-# Common makefile for database utils. ICC edition
+# Odin32 Api Database Utilities.
 #
-
-# include common definitions
-ODIN32_TCOMMON = ..\common
-ODIN32_BIN     = $(ODIN32_TOOLS)
-!include ../../makefile.inc
-!include $(ODIN32_TCOMMON)/common.mk
-
-# Addjust common definitions
-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
-CXXFLAGS = $(CXXFLAGS) -Ge+ -Gx- -Tx+ -Tm- $(CINCLUDES) -DNO_CLIENT_LONG_LONG -Wall+ppt-ppc-inl-cnv-gnr-vft- -Gh+ -DDEBUG_ALLOC
-LDFLAGS  = $(LDFLAGS)  -Ge+ -Fe$@ /B"/MAP:full /STACK:0x50000" $(RTLLIB) os2386.lib cppopa3.obj
-!else
-CFLAGS   = $(CFLAGS)   -Ge+ -Tx+ $(CINCLUDES)      -DNO_CLIENT_LONG_LONG -Wall+ppt-ppc-inl-cnv-gnr-vft-
-CXXFLAGS = $(CXXFLAGS) -Ge+ -Gx- -Tx+ $(CINCLUDES) -DNO_CLIENT_LONG_LONG -Wall+ppt-ppc-inl-cnv-gnr-vft-
-LDFLAGS  = $(LDFLAGS)  -Ge+ -Fe$@ /B"/MAP:full /STACK:0x50000" $(RTLLIB) os2386.lib
-!endif
+#
 
 
 #
-# All roule
+# Common tools macros. (MAKE_CMD)
 #
-all: APIImport.exe StateUpd.exe kHTMLPC.exe   \
-     ..\bin\APIImport.exe ..\bin\StateUpd.exe \
-     ..\bin\kHTMLPC.exe
-
+!include ../../makefile.inc
 
 
 #
-# APIImport
+# dummy all rule - invoking nmake withtout target caused it to do all of the targets below..
 #
-APIImport.exe: APIImport.obj db.obj $(COMMONLIB) mysql\libmysqlclient.lib
-   $(LD) $(LDFLAGS) $**
-
-..\bin\APIImport.exe: APIImport.exe
-   $(CP) $** $@
-
+_all: all
 
 
 #
-# StateUpd
+# All the common rules like all, lib, clean and dep.
 #
-StateUpd.exe: StateUpd.obj db.obj mysql\libmysqlclient.lib
-   $(LD) $(LDFLAGS) $**
-
-..\bin\StateUpd.exe: StateUpd.exe
-   $(CP) $** $@
-
-
-
-#
-# kHTMLPC - HTML/Sql PreCompiler.
-#
-kHTMLPC.exe: kHTMLPC.obj db.obj gd/gdicc.lib mysql\libmysqlclient.lib
-   $(LD) $(LDFLAGS) $**
-
-
-..\bin\kHTMLPC.exe: kHTMLPC.exe
-   $(CP) $** $@
-
-gd\gdicc.lib: force
-   $(DODIRS) "gd" $(MAKE_CMD) gdicc.lib
-
-
-
-# kHTHMLPC - interference roules for preprocessing of kSqlHtml files.
-.SUFFIXES: .html .ksqlhtml .obj
-.kSqlHtml.html:
-    kHTMLPC $<
-.kSqlHtml.obj: # Visual SlickEdit thinks everything complies to .obj files...
-    kHTMLPC $<
+$(COMMONRULES):
+    $(MAKE_CMD) -f APIImport.mak $@
+    $(MAKE_CMD) -f StateUpd.mak $@
 
 
@@ -98 +47 @@
    -mysqladmin refresh
 
-
-
-#
-# Autogenerated depenencies.
-#
-dep:
-    $(DEPEND) $(CINCLUDES) -o- *.h *.asm *.inc $(ODIN32_INCLUDE)\*.h \
-        *.c *.cpp -objo *.c *.cpp
-    $(DODIRS) "gd" $(MAKE_CMD) dep
-
-
-
-#
-# clean
-#
-clean:
-    $(RM) *.obj *.lib *.o *.a *.dll *.exe *.pch *.log *.map *.html
-!ifdef ODIN32_BIN
-    $(RM) $(ODIN32_BIN)\StateUpd.exe $(ODIN32_BIN)\APIImport.exe $(ODIN32_BIN)\kHTMLPC.exe
-!endif
-    $(DODIRS) "gd" $(MAKE_CMD) clean
-
-
-
-#
-# Include the .depend file.
-#   If the depend file don't exists we'll complain about it.
-#
-!ifndef NODEP
-!   if [$(EXISTS) .depend] == 0
-!       include .depend
-!   else
-!       if [$(ECHO) .depend doesn't exist]
-!       endif
-!   endif
-!endif
-
-
-
-force:
-    @$(ECHO) ...
-
-
-#
-# Common rules.
-#
-!include $(ODIN32_TCOMMON_POST_INC)
-