Changeset 4654 for trunk/tools/common/common.mk

Timestamp:

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

Author:

bird

Message:

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

File:

• trunk/tools/common/common.mk (modified) (3 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)
+