Changeset 4624 for trunk/src/shell32

Timestamp:

Nov 19, 2000, 10:27:40 AM (25 years ago)

Author:

bird

Message:

New makefile style.

File:

• trunk/src/shell32/makefile (modified) (3 diffs)

trunk/src/shell32/makefile

@@ -1 @@
-# $Id: makefile,v 1.29 2000-11-09 21:09:53 sandervl Exp $
+# $Id: makefile,v 1.30 2000-11-19 08:50:16 bird Exp $
 
 #
@@ -7 +7 @@
 #
 
-# Directory macros.
-PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB     = ..\..\lib
-PDWIN32_BIN     = ..\..\$(OBJDIR)
-PDWIN32_TOOLS   = ..\..\tools\bin
 
+#
 # Compiler, tools, and interference rules.
-!include $(PDWIN32_INCLUDE)/pdwin32.mk
-
-# Flag overloads and local macros.
-CLEANEXTRAS = shres.asm
-
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+#
+!include ../../include/pdwin32.mk
 
 
-# Object files. All objects should be prefixed with $(OBJDIR)!
-OBJS =  \
+#
+# Object files. Prefix with OBJDIR and one space before the '\'.
+#
+OBJS = \
 $(OBJDIR)\initterm.obj \
 $(OBJDIR)\brsfolder.obj \
@@ -63 +56 @@
 
 
+#
+# Libraries. One space before the '\'.
+#
+LIBS = \
+$(PDWIN32_LIB)/kernel32.lib \
+$(PDWIN32_LIB)/user32.lib \
+$(PDWIN32_LIB)/advapi32.lib \
+$(PDWIN32_LIB)/gdi32.lib \
+$(PDWIN32_LIB)/ole32.lib \
+$(PDWIN32_LIB)/version.lib \
+$(PDWIN32_LIB)/comctl32.lib \
+$(PDWIN32_LIB)/$(ODINCRT).lib \
+$(PDWIN32_LIB)/pmwinx.lib \
+$(PDWIN32_LIB)/shlwapi.lib \
+OS2386.LIB \
+$(RTLLIB_O)
+
+
+#
 # Target name - name of the dll without extention and path.
+#
 TARGET = shell32
 
 
-# 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
-    -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)/pmwinx.lib
-$(PDWIN32_LIB)/kernel32.lib
-$(PDWIN32_LIB)/user32.lib
-$(PDWIN32_LIB)/advapi32.lib
-$(PDWIN32_LIB)/gdi32.lib
-$(PDWIN32_LIB)/ole32.lib
-$(PDWIN32_LIB)/version.lib
-$(PDWIN32_LIB)/comctl32.lib
-$(PDWIN32_LIB)/$(ODINCRT).lib
-$(PDWIN32_LIB)/shlwapi.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
-
-
-$(OBJDIR)\shres.obj: shell32_Ca.orc \
-shell32_Cs.orc \
-shell32_Da.orc \
-shell32_De.orc \
-shell32_En.orc \
-shell32_Eo.orc \
-shell32_Es.orc \
-shell32_Fi.orc \
-shell32_Fr.orc \
-shell32_Hu.orc \
-shell32_It.orc \
-shell32_Nl.orc \
-shell32_No.orc \
-shell32_Pl.orc \
-shell32_Pt.orc \
-shell32_Ru.orc \
-shell32_Sv.orc \
-shell32_Wa.orc \
-shell32_xx.orc \
-shres.orc \
-
-
+#
 # Includes the common rules.
+#
 !include $(PDWIN32_INCLUDE)/pdwin32.post