Changeset 3532 for trunk/tools/common

Timestamp:

May 13, 2000, 5:40:34 PM (25 years ago)

Author:

bird

Message:

Updated makefiles to be more comform with the new makefile style.

Location:

trunk/tools/common

Files:

• makefile (modified) (4 diffs)
• makefile.gcc (modified) (5 diffs)
• makefile.icc (modified) (2 diffs)

trunk/tools/common/makefile

@@ -1 @@
-# $Id: makefile,v 1.3 2000-02-09 23:50:51 bird Exp $
+# $Id: makefile,v 1.4 2000-05-13 15:40:34 bird Exp $
 
 #
@@ -36 +36 @@
 
 
-dep:
-    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
-    *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h *.c *.cpp -objo *.c *.cpp -objgobj *.c *.cpp
-
-
 commonicc.lib: dummy
     -@echo $@
@@ -53 +48 @@
     @$(MAKE_CMD) OMF=1 -f makefile.gcc
 
+
 #a simple hack to make nmake process the target.
 dummy:
@@ -64 +60 @@
 
 
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+        *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h *.c *.cpp -objo *.c *.cpp -objgobj *.c *.cpp
 

trunk/tools/common/makefile.gcc

@@ -1 @@
-# $Id: makefile.gcc,v 1.3 2000-02-09 23:50:51 bird Exp $
+# $Id: makefile.gcc,v 1.4 2000-05-13 15:40:34 bird Exp $
 
 #
@@ -8 +8 @@
 #
 
-# common include directory
+#
+# Directories and common tools.
+#
+PDWIN32_TOOLS   = ..\bin
 PDWIN32_INCLUDE = ..\..\include
+!include $(PDWIN32_INCLUDE)\pdwin32.tools
 
-!ifndef RM
-RM = rm -f
-!endif
+# Definitions for pdwin32.post
+LOCALCLEAN  = 1
+CLEANEXTRAS = commongcc.*
+
+
+#
+# If OMF flag isn't set, set it to default value.
+#
 !ifndef OMF
 OMF=0
 !endif
+
 
 #
@@ -24 +34 @@
 CXX = gcc
 LD  = gcc
+!ifdef DEBUG
+OBJDIR  = .\bin\debug
+!else
+OBJDIR  = .\bin\release
+!endif
+
 
 !if $(OMF) == 0
+# aout version
 O        = o
 LIB      = a
@@ -32 +49 @@
 
 !else
-
+# OMF version
 O        = gobj
 LIB      = lib
 AR       = emxomfar
 CFZOMF   = -Zomf
+
 !endif
+
 
 CDEFINES  = -D__WIN32OS2__ -D__WINE__
 CINCLUDES = -I$(PDWIN32_INCLUDE)\Win -I$(PDWIN32_INCLUDE)
+CPLUS_INCLUDE_PATH= $(CPLUS_INCLUDE_PATH);$(INCLUDE)
 
-#Note: Add -fhandle-exceptions if old gcc version (< 2.8.x?).
+# Note: Add -fhandle-exceptions if old gcc version (< 2.8.x?).
 !ifndef DEBUG
 CFLAGS    = $(CFZOMF) -Wall -Zmap -Zmt -mprobe -Wall -s -O
@@ -52 +72 @@
 
 #
-# interference rules
+# Interference rules
 #
-.c.$(O):
+.c{$(OBJDIR)}.$(O):
     $(CC) -c $(CFLAGS) $(CDEFINES) $(CINCLUDES) $< -o $@
 
-.cpp.$(O):
+.cpp{$(OBJDIR)}.$(O):
     $(CXX) -c $(CXXFLAGS) $(CDEFINES) $(CINCLUDES) $< -o $@
 
 
-
-all: commongcc.$(LIB)
+#
+# Object files.
+#
+OBJS = \
+$(OBJDIR)\kFilePe.$(O) \
+$(OBJDIR)\kFileDef.$(O) \
+$(OBJDIR)\kFileLx.$(O) \
+$(OBJDIR)\kFileFormatBase.$(O)
 
 
-commongcc.$(LIB): kFilePE.$(O) kFileDef.$(O)
-   $(RM) $@
-   $(AR) cr $@ kFilePE.$(O) kFileDef.$(O)
+#
+# All rule.
+#
+all:    $(OBJDIR) \
+        commongcc.$(LIB)
 
 
-dep:
-    @nmake /nologo -f makefile NODEP=1 dep
+$(OBJDIR)\commongcc.$(LIB): $(OBJS)
+   $(RM) $@
+   $(AR) cr $@ $(OBJS)
 
-!ifndef NODEP
-!include .depend
-!endif
+commongcc.$(LIB): $(OBJDIR)\commongcc.$(LIB)
+   $(CP) $** $@
 
 
-clean:
-   @$(RM) *.$(O) commongcc.$(LIB)
+#
+# dependent rule. forward to main makefile.
+#
+dep:
+    @$(MAKE) /nologo -f makefile NODEP=1 dep
 
+
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
+

trunk/tools/common/makefile.icc

@@ -1 @@
-# $Id: makefile.icc,v 1.6 2000-03-27 10:18:42 bird Exp $
+# $Id: makefile.icc,v 1.7 2000-05-13 15:40:34 bird Exp $
 
 #
@@ -9 +9 @@
 
 
+#
+# Include common definitions
+#
+PDWIN32_TOOLS   = ..\bin
+PDWIN32_INCLUDE = ..\..\include
+!include $(PDWIN32_INCLUDE)\pdwin32.mk
 
-# include common definitions
-PDWIN32_INCLUDE = ..\..\include
-!include ..\..\include\pdwin32.mk
+# Definitions for pdwin32.post
+LOCALCLEAN  = 1
+CLEANEXTRAS = commonicc.lib
 
-# Addjust common definitions
-AR       = ilib /nofree /quiet /nobackup
+#
+# 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-
 
 
-all: commonicc.lib
+#
+# Object files.
+# Important! No space after the filenames! The space will be converted
+#     to a '+' operator on the ILIB command line. NMAKE adds a space
+#     for each new line. This space is converted to a '+' which
+#     prefixes each filenames.
+#
+OBJS =\
+$(OBJDIR)\kFilePe.obj\
+$(OBJDIR)\kFileDef.obj\
+$(OBJDIR)\kFileLx.obj\
+$(OBJDIR)\kFileFormatBase.obj
 
 
-commonicc.lib: kFilePe.obj kFileDef.obj kFileLx.obj kFileFormatBase.obj
-    -$(RM) $@
-    $(AR) $@ -+kFilePe.obj -+kFileDef.obj -+kFileLx.obj -+kFileFormatBase.obj, NUL;
+#
+# All rule.
+#
+all:    $(OBJDIR) \
+        commonicc.lib
 
 
+commonicc.lib: $(OBJDIR)\commonicc.lib
+    $(CP) $@ $**
+
+$(OBJDIR)\commonicc.lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $@ $(OBJS: = +), NUL;
+
+#
+# dependent rule. forward to main makefile.
+#
 dep:
-    @nmake /nologo -f makefile NODEP=1 dep
-
-!ifndef NODEP
-!include .depend
-!endif
+    @$(MAKE) /nologo -f makefile NODEP=1 dep
 
 
-clean:
-   @$(RM) *.obj commonicc.lib cset*.pch
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-
-
-