Changeset 4654 for trunk/tools

Timestamp:

Nov 21, 2000, 5:37:23 AM (25 years ago)

Author:

bird

Message:

Addopted makestyle new style. common.lib goes into $(OBJDIR).

Location:

trunk/tools/common

Files:

• common.mak (added)
• common.mk (modified) (3 diffs)
• common.mk.post (modified) (3 diffs)
• kDef2Wat.mak (added)
• kDump.mak (added)
• makefile (modified) (2 diffs)

trunk/tools/common/common.mk

@@ -1 @@
-# $Id: common.mk,v 1.2 2000-11-19 08:29:54 bird Exp $
+# $Id: common.mk,v 1.3 2000-11-21 04:37:22 bird Exp $
 #
 # Common definitions for tools.
@@ -13 +13 @@
 
 
-
 #
-# Make a suggestion of which common<gcc|icc>.<a|lib> library
-# to use.
-# not defined OMF indicates ICC
+# Make a suggestion of which common.<a|lib> library to use.
+# Not defined OMF indicates VAC or Watcom.
 # OMF=0 indicates GCC+aout
 # OMF=1 indicates GCC+OMF
 #
-!ifndef OMF
-COMMONLIB = $(PDWIN32_TCOMMON)\commonicc.lib
+!ifndef GCC
+COMMONLIB = $(PDWIN32_TCOMMON)\$(OBJDIR)\common.lib
 !else
     !if $(OMF) == 0
-COMMONLIB = $(PDWIN32_TCOMMON)\commongcc.a
+COMMONLIB = $(PDWIN32_TCOMMON)\$(OBJDIR)\common.a
     !else
-COMMONLIB = $(PDWIN32_TCOMMON)\commongcc.lib
+COMMONLIB = $(PDWIN32_TCOMMON)\$(OBJDIR)\common.lib
     !endif
 !endif
@@ -35 +33 @@
 # Add PDWIN32_TCOMMON to the C and C++ includes.
 #
-CINCLUDES = -I$(PDWIN32_TCOMMON) $(CINCLUDE)
+CINCLUDES = -I$(PDWIN32_TCOMMON) $(CINCLUDES)
 
+
+#
+# No internal libs cause we define our own internal libs.
+#
+NO_INTERNAL_LIBS = 1
+INTLIBS = $(COMMONLIB)
+

trunk/tools/common/common.mk.post

@@ -1 @@
-# $Id: common.mk.post,v 1.1 2000-05-13 17:17:08 bird Exp $
+# $Id: common.mk.post,v 1.2 2000-11-21 04:37:22 bird Exp $
 #
 # Common rules for tools.
@@ -17 +17 @@
 # Rules for making
 #
-$(PDWIN32_TCOMMON)\commongcc.a  \
-$(PDWIN32_TCOMMON)\commongcc.lib \
-$(PDWIN32_TCOMMON)\commonicc.lib : commonforce
+$(PDWIN32_TCOMMON)\$(OBJDIR)\common.a  \
+$(PDWIN32_TCOMMON)\$(OBJDIR)\common.lib : commonforce
     cd $(PDWIN32_TCOMMON)
 !ifdef MAKE_CMD
@@ -26 +25 @@
     $(MAKE) -nologo \
 !endif
-        $(@F)
+        $(OBJDIR)\$(@F)
     cd $(MAKEDIR)
+
 
 #

trunk/tools/common/makefile

@@ -1 @@
-# $Id: makefile,v 1.8 2000-11-19 08:29:54 bird Exp $
+# $Id: makefile,v 1.9 2000-11-21 04:37:23 bird Exp $
 
 #
@@ -12 +12 @@
 #            dep: Creates the .depend file.
 #            needed: Builds the tools used during compilation of the src tree.
-#            commonicc.lib: Build the IBM VA for C++ version of the library.
-#            commongcc.a:   Build the gcc version of the library - aout
-#            commongcc.lib: Build the gcc version of the library - OMF.
+#            common.lib or libs: Make common.lib.
+#            kDef2Wat.exe: kDef2Wat.exe
+#            kDump.exe: kDump.exe
 #
 #
 
+
+#
+# Compiler, tools, and interference rules.
+#
 !include ..\..\include\pdwin32.mk
 
 
-all:    commonicc.lib commongcc.a commongcc.lib \
+#
+# All rule.
+#
+all:    $(OBJDIR)\common.lib \
+!ifdef GCC
+        $(OBJDIR)\common.a \
+!endif
         $(PDWIN32_TOOLS)\kDef2Wat.exe
 #        $(PDWIN32_TOOLS)\kDump.exe
 
 
-needed: commonicc.lib $(PDWIN32_TOOLS)\kDef2Wat.exe
+#
+# The neede tools
+#
+needed:     $(OBJDIR)\common.lib \
+            $(PDWIN32_TOOLS)\kDef2Wat.exe
 
 
-commonicc.lib: dummy
+#
+# The library.
+#
+libs $(OBJDIR)\common.lib: force
     -@echo $@
-    @$(MAKE_CMD) -f makefile.icc
+    @$(MAKE_CMD) -f common.mak all
 
-commongcc.a: dummy
+#
+# The Aout library.
+#
+$(OBJDIR)\common.a: force
     -@echo $@
-    @$(MAKE_CMD) OMF=0 -f makefile.gcc
-
-commongcc.lib: dummy
-    -@echo $@
-    @$(MAKE_CMD) OMF=1 -f makefile.gcc
+    @$(MAKE_CMD) OMF=1 -f common.mak all
 
 
-$(PDWIN32_TOOLS)\kDump.exe $(OBJDIR)\kDump.exe kDump.exe: dummy
+#
+# Tools.
+#
+$(PDWIN32_TOOLS)\kDump.exe    $(OBJDIR)\kDump.exe    kDump.exe \
+$(PDWIN32_TOOLS)\kDef2Wat.exe $(OBJDIR)\kDef2Wat.exe kDef2Wat.exe : force
     -@echo $@
-    @$(MAKE_CMD) -f makefile.icc $@
+    @$(MAKE_CMD) -f $(@B).mak all
 
 
-$(PDWIN32_TOOLS)\kDef2Wat.exe $(OBJDIR)\kDef2Wat.exe kDef2Wat.exe: dummy
-    -@echo $@
-    @$(MAKE_CMD) -f makefile.icc $@
+#
+# Clean rule.
+#
+clean:
+    $(MAKE_CMD) -f common.mak clean
+    $(MAKE_CMD) -f kDef2Wat.mak clean
+    $(MAKE_CMD) -f kDump.mak clean
 
 
-#a simple hack to make nmake process the target.
-dummy:
+#
+# Dep rule - makes depenencies for C, C++ and Asm files.
+#
+dep:
+    $(DEPEND) $(CINCLUDES) *.c *.cpp *.h *.asm *.inc \
+        *.rc *.dlg $(PDWIN32_INCLUDE)\*.h -robj *.orc \
+        -objo    *.c *.cpp \
+        -objgobj *.c *.cpp
+
+
+#
+# A simple hack to make nmake process the target.
+#
+force:
      -@echo ...
 
 
-clean:
-    @$(MAKE_CMD) -f makefile.icc clean
-    @$(MAKE_CMD) OMF=0 -f makefile.gcc clean
-    @$(MAKE_CMD) OMF=1 -f makefile.gcc clean
+#
+# Lib rule - dummy rule
+#
+lib:
 
-
-dep:
-    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
-        *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h *.c *.cpp -objo *.c *.cpp -objgobj *.c *.cpp
-
-#
-# Do not includes the common rules.
-#
-