Changeset 3031 for trunk/src/user32

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.

Location:

trunk/src/user32

Files:

• Makefile (modified) (4 diffs)
• user32.rc (deleted)
• user32rsrc.orc (added)

trunk/src/user32/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.67 2000-03-04 23:47:19 sandervl Exp $
+# $Id: Makefile,v 1.68 2000-03-06 23:39:12 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       user32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
 PDWIN32_LIB     = ..\..\lib
-PDWIN32_BIN     = ..\..\bin
+PDWIN32_BIN     = ..\..\$(OBJDIR)
 PDWIN32_TOOLS   = ..\..\tools\bin
 
-#SvL: Remove this when everything has been converted to the new build rules
-NEWBUILD=1
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-RESOURCES= resource
-CFLAGS   = $(CFLAGS)   -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
 
-TARGET = user32
+# Flag overloads and local macros.
+CLEANEXTRAS = user32rsrc.asm
 
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
 OBJS = \
 $(OBJDIR)\user32.obj \
@@ -84 +84 @@
 $(OBJDIR)\dbglocal.obj \
 $(OBJDIR)\caret.obj \
-$(OBJDIR)\$(RESOURCES).obj \
 $(OBJDIR)\winproc.obj \
 $(OBJDIR)\text.obj \
@@ -91 +90 @@
 $(OBJDIR)\windlg.obj \
 $(OBJDIR)\win32wdesktop.obj \
-$(OBJDIR)\win32wbasenonclient.obj
+$(OBJDIR)\win32wbasenonclient.obj \
+$(OBJDIR)\user32rsrc.obj
 
-all: $(OBJDIR) $(TARGET).dll $(TARGET).lib
 
-$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
-        $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
-        $(CP) $@ $(PDWIN32_BIN)
+# Target name - name of the dll without extention and path.
+TARGET = user32
 
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
+
+
+# Linker file - creates the parameter file passed on to the linker.
 $(OBJDIR)\$(TARGET).lrf: makefile
-        @echo Creating file <<$(OBJDIR)\$(@B).lrf
+        @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
 $(OBJS)
 $(PDWIN32_LIB)/pmwinx.lib
@@ -113 +131 @@
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-
-$(RESOURCES).asm: user32.rc
-    $(RC) $(RCFLAGS) -o $(RESOURCES).asm user32.rc
-
+# 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
 
+
+# Includes the common rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.post