Changeset 3037 for trunk/src/msvcrt/makefile

Timestamp:

Mar 7, 2000, 12:12:31 PM (26 years ago)

Author:

bird

Message:

Corrections.

File:

• trunk/src/msvcrt/makefile (modified) (1 diff)

trunk/src/msvcrt/makefile

@@ -1 @@
-# $Id: makefile,v 1.14 2000-03-06 23:38:46 bird Exp $
+# $Id: makefile,v 1.15 2000-03-07 11:08:46 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       msvcrt.dll makefile
 #
 
-# Kso: not converted.
-OLDBUILD = 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) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
-
-RC = $(PDWIN32_TOOLS)\wrc
-RCFLAGS = -s -I. -I$(CPPMAIN)\include -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win
-
-TARGET = msvcrt
-TARGET20 = msvcrt20
-TARGET40 = msvcrt40
-
-OBJS   =  msvcrt.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
-OBJS20 =  msvcrt.obj resource20.obj $(PDWIN32_LIB)/dllentry.obj
-OBJS40 =  msvcrt.obj resource40.obj $(PDWIN32_LIB)/dllentry.obj
-
-all: $(TARGET).dll $(TARGET).lib $(TARGET20).dll $(TARGET20).lib \
-     $(TARGET40).dll $(TARGET40).lib
+# Flag overloads and local macros.
+CLEANEXTRAS = msvcrtrsrc.asm msvcrt20rsrc.asm msvcrt40rsrc.asm \
+              $(PDWIN32_BIN)\msvcrt.dll   $(PDWIN32_LIB)\msvcrt.lib   \
+              $(PDWIN32_BIN)\msvcrt20.dll $(PDWIN32_LIB)\msvcrt20.lib \
+              $(PDWIN32_BIN)\msvcrt40.dll $(PDWIN32_LIB)\msvcrt40.lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/crtdll.lib  \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
-
-$(TARGET20).dll: $(OBJS20) $(TARGET20).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS20) $(TARGET20).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/crtdll.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
-
-$(TARGET40).dll: $(OBJS40) $(TARGET40).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS40) $(TARGET40).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/crtdll.lib  \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\msvcrt.obj \
+$(OBJDIR)\$(TARGET)rsrc.obj \
+$(PDWIN32_LIB)\dllentry.obj
 
 
-lib: $(TARGET).lib  $(PDWIN32_LIB)\$(TARGET).lib \
-                    $(PDWIN32_LIB)\$(TARGET20).lib \
-                    $(PDWIN32_LIB)\$(TARGET40).lib
+!ifndef TARGET
 
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(PDWIN32_LIB)\$(TARGET20).lib: $(TARGET20).lib
-    $(CP) $** $@
-
-$(PDWIN32_LIB)\$(TARGET40).lib: $(TARGET40).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET).def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET20).lib: $(TARGET20).def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET40).lib: $(TARGET40).def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
-    $(CP) $@ $(PDWIN32_LIB)
-
-resource.asm: msvcrt.rc
-    $(RC) $(RCFLAGS) -o resource.asm msvcrt.rc
-
-resource20.asm: msvcrt20.rc
-    $(RC) $(RCFLAGS) -o resource20.asm msvcrt20.rc
-
-resource40.asm: msvcrt40.rc
-    $(RC) $(RCFLAGS) -o resource40.asm msvcrt40.rc
+# Dummy all rule - if not both all and lib will be invoked when
+# invoking nmake without a target.
+_all: all
 
 
+# All and lib rules - builds all targets by reinvoking make with target macro set.
+all lib:
+    $(MAKE_CMD) TARGET=msvcrt   $@
+    $(MAKE_CMD) TARGET=msvcrt20 $@
+    $(MAKE_CMD) TARGET=msvcrt40 $@
+
+
+!else
+
+
+# Real all rule - build objs, target dll, copies dll to bin and makes libs.
+all:   $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
+
+
+# Real lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+!endif
+
+
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
+
+
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/crtdll.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<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
+
+# Dummy target used for clean
+!ifndef TARGET
+TARGET = msvcrt
 !endif
 
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch resource*.asm \
-        $(PDWIN32_BIN)\$(TARGET).dll \
-        $(PDWIN32_BIN)\$(TARGET20).dll \
-        $(PDWIN32_BIN)\$(TARGET40).dll \
-        $(PDWIN32_LIB)\$(TARGET).lib   \
-        $(PDWIN32_LIB)\$(TARGET20).lib \
-        $(PDWIN32_LIB)\$(TARGET40).lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post