Changeset 3537 for trunk/tools

Timestamp:

May 13, 2000, 7:17:46 PM (25 years ago)

Author:

bird

Message:

Made makefiles more comform with new standards.

Location:

trunk/tools/common

Files:

• makefile.gcc (modified) (3 diffs)
• makefile.icc (modified) (4 diffs)

trunk/tools/common/makefile.gcc

@@ -1 @@
-# $Id: makefile.gcc,v 1.4 2000-05-13 15:40:34 bird Exp $
+# $Id: makefile.gcc,v 1.5 2000-05-13 17:17:46 bird Exp $
 
 #
@@ -8 +8 @@
 #
 
-#
-# Directories and common tools.
-#
-PDWIN32_TOOLS   = ..\bin
-PDWIN32_INCLUDE = ..\..\include
-!include $(PDWIN32_INCLUDE)\pdwin32.tools
-
-# Definitions for pdwin32.post
-LOCALCLEAN  = 1
-CLEANEXTRAS = commongcc.*
-
 
 #
@@ -26 +15 @@
 OMF=0
 !endif
+
+
+#
+# Directories and common tools.
+#
+PDWIN32_INCLUDE = ..\..\include
+PDWIN32_BIN     = ..\..\bin\$(OBJDIR)
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_TOOLS   = ..\bin
+PDWIN32_TCOMMON = ..\common
+!include $(PDWIN32_INCLUDE)\pdwin32.tools
+
+# Definitions for pdwin32.post
+LOCALCLEAN  = 1
+CLEANEXTRAS = commongcc.*
 
 

trunk/tools/common/makefile.icc

@@ -1 @@
-# $Id: makefile.icc,v 1.8 2000-05-13 16:04:44 bird Exp $
+# $Id: makefile.icc,v 1.9 2000-05-13 17:17:46 bird Exp $
 
 #
@@ -9 +9 @@
 
 
-#
-# Include common definitions
-#
+# Directory macros.
+PDWIN32_INCLUDE = ..\..\include
+PDWIN32_BIN     = ..\..\bin\$(OBJDIR)
+PDWIN32_LIB     = ..\..\lib
 PDWIN32_TOOLS   = ..\bin
-PDWIN32_INCLUDE = ..\..\include
-!include $(PDWIN32_INCLUDE)\pdwin32.mk
+PDWIN32_TCOMMON = ..\common
 
-# Definitions for pdwin32.post
+
+# Defines for the pdwin32.post and pdwin32.mk
+EXETARGET   = 1
 LOCALCLEAN  = 1
 CLEANEXTRAS = commonicc.lib
 
-#
+
+# Compiler, tools, and interference rules.
+!include $(PDWIN32_INCLUDE)\pdwin32.mk
+
+
 # Addjust common definitions...
-#
-CFLAGS   = $(CFLAGS)   -Ge+ -Tx+ -Tm+ -I$(PDWIN32_INCLUDE)      -Wall+ppt-ppc-inl-cnv-gnr-vft-
-CXXFLAGS = $(CXXFLAGS) -Ge+ -Gx- -Tx+ -Tm+ -I$(PDWIN32_INCLUDE) -Wall+ppt-ppc-inl-cnv-gnr-vft-
+CFLAGS   = $(CFLAGS)   -Wall+ppt-ppc-inl-cnv-gnr-vft-
+CXXFLAGS = $(CXXFLAGS) -Wall+ppt-ppc-inl-cnv-gnr-vft-
 
 
@@ -41 +46 @@
 
 
-#
 # All rule.
-#
 all:    $(OBJDIR) \
         commonicc.lib
@@ -55 +58 @@
     $(ILIB) $@ $(OBJS: = +), NUL;
 
-#
-# dependent rule. forward to main makefile.
-#
+
+# Dependent rule. Forward to main makefile.
 dep:
     @$(MAKE) /nologo -f makefile NODEP=1 dep