Changeset 3031 for trunk/src/shell32

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/shell32

Files:

• makefile (modified) (1 diff)
• shell32_Ca.orc (added)
• shell32_Ca.rc (deleted)
• shell32_Cs.orc (added)
• shell32_Cs.rc (deleted)
• shell32_Da.orc (added)
• shell32_Da.rc (deleted)
• shell32_De.orc (added)
• shell32_De.rc (deleted)
• shell32_En.orc (added)
• shell32_En.rc (deleted)
• shell32_Eo.orc (added)
• shell32_Eo.rc (deleted)
• shell32_Es.orc (added)
• shell32_Es.rc (deleted)
• shell32_Fi.orc (added)
• shell32_Fi.rc (deleted)
• shell32_Fr.orc (added)
• shell32_Fr.rc (deleted)
• shell32_Hu.orc (added)
• shell32_Hu.rc (deleted)
• shell32_It.orc (added)
• shell32_It.rc (deleted)
• shell32_Ko.rc (deleted)
• shell32_Nl.orc (added)
• shell32_Nl.rc (deleted)
• shell32_No.orc (added)
• shell32_No.rc (deleted)
• shell32_Pl.orc (added)
• shell32_Pl.rc (deleted)
• shell32_Pt.orc (added)
• shell32_Pt.rc (deleted)
• shell32_Ru.orc (added)
• shell32_Ru.rc (deleted)
• shell32_Sv.orc (added)
• shell32_Sv.rc (deleted)
• shell32_Wa.orc (added)
• shell32_Wa.rc (deleted)
• shell32_xx.orc (added)
• shell32_xx.rc (deleted)
• shres.orc (added)
• shres.rc (deleted)

trunk/src/shell32/makefile

@@ -1 @@
-# $Id: makefile,v 1.21 2000-02-09 23:47:02 bird Exp $
+# $Id: makefile,v 1.22 2000-03-06 23:38:57 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       shell32.dll makefile
 #
 
+# 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
 
+# Flag overloads and local macros.
+CLEANEXTRAS = shres.asm
 
 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
 
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS =  \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\brsfolder.obj \
+$(OBJDIR)\classes.obj \
+$(OBJDIR)\contmenu.obj \
+$(OBJDIR)\dataobject.obj \
+$(OBJDIR)\enumidlist.obj \
+$(OBJDIR)\folders.obj \
+$(OBJDIR)\iconcache.obj \
+$(OBJDIR)\memorystream.obj \
+$(OBJDIR)\pidl.obj \
+$(OBJDIR)\regstream.obj \
+$(OBJDIR)\shell32_main.obj \
+$(OBJDIR)\shellguid.obj \
+$(OBJDIR)\shelllink.obj \
+$(OBJDIR)\shlmenu.obj \
+$(OBJDIR)\shellole.obj \
+$(OBJDIR)\shellord.obj \
+$(OBJDIR)\shellpath.obj \
+$(OBJDIR)\shv_bg_cmenu.obj \
+$(OBJDIR)\shlfolder.obj \
+$(OBJDIR)\shlview.obj \
+$(OBJDIR)\shell.obj \
+$(OBJDIR)\unknown.obj \
+$(OBJDIR)\misc.obj \
+$(OBJDIR)\she.obj \
+$(OBJDIR)\sh.obj \
+$(OBJDIR)\shpolicy.obj \
+$(OBJDIR)\shres.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = shell32
 
-OBJS =  initterm.obj \
-        brsfolder.obj classes.obj contmenu.obj dataobject.obj \
-        enumidlist.obj folders.obj iconcache.obj memorystream.obj \
-        pidl.obj regstream.obj shell32_main.obj \
-        shellguid.obj shelllink.obj shlmenu.obj shellole.obj \
-        shellord.obj shellpath.obj shv_bg_cmenu.obj \
-        shlfolder.obj shlview.obj shell.obj unknown.obj misc.obj \
-        she.obj sh.obj resource.obj shpolicy.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(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 OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: shres.rc shell32_en.rc
-    $(RC) $(RCFLAGS) -o resource.asm shres.rc
+# 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
+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
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-