Changeset 3031 for trunk/src/peldr

Timestamp:

Mar 7, 2000, 12:39:20 AM (26 years ago)

Author:

bird

Message:

Makefiles are updated to new style.
Odin32 resource files are renamed to *.orc and most have changed name to avoid
name clashes for object files.

File:

• trunk/src/peldr/makefile (modified) (2 diffs)

trunk/src/peldr/makefile

@@ -1 @@
-# $Id: makefile,v 1.14 2000-02-09 23:47:01 bird Exp $
+# $Id: makefile,v 1.15 2000-03-06 23:38:55 bird Exp $
 
 #
@@ -7 +7 @@
 #
 
+# Tell that we're producing an executable
+EXETARGET = 1
+
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CFLAGS   = $(CFLAGS) /Ge+ -I$(PDWIN32_INCLUDE) -Gn-
-CXXFLAGS = $(CXXFLAGS) /Ge+ -I$(PDWIN32_INCLUDE) -Gn-
-LDFLAGS  = $(LDFLAGS_ODINCRT) /Ge+ /B"/pmtype:pm /stack:0x100000 /NOBASE /Map" \
-           os2386.lib
+
+# Flag overloads and local macros.
+CLEANEXTRAS = $(PDWIN32_BIN)\$(TARGET).exe
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = $(OBJDIR)\pe.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = pe
 
-OBJS =  pe.obj
 
-all: $(TARGET).exe
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).exe \
+        $(PDWIN32_BIN)\$(TARGET).exe
 
 
-$(TARGET).exe: $(OBJS) makefile
-    $(LD) $(LDFLAGS) -Fe$@ $(OBJS)
-    $(CP) $(TARGET).exe $(PDWIN32_BIN)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - dummy rule.
+lib:
 
 
+# Exe rule - builds the target exe.
+$(OBJDIR)\$(TARGET).exe: $(OBJS) $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS_ODINCRT) @$(OBJDIR)\$(TARGET).lrf
+
+
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).exe
+/MAP:$(OBJDIR)\$(TARGET).map
+/PMTYPE:pm
+/STACK:0x100000
+/NOBASE
+$(OBJS)
+os2386.lib
+<<keep
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch *.exe \
-        $(PDWIN32_BIN)\$(TARGET).exe
-