Changeset 3031 for trunk/src/comdlg32

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

Files:

• cdlg_Ca.orc (added)
• cdlg_Ca.rc (deleted)
• cdlg_Cs.orc (added)
• cdlg_Cs.rc (deleted)
• cdlg_Da.orc (added)
• cdlg_Da.rc (deleted)
• cdlg_De.orc (added)
• cdlg_De.rc (deleted)
• cdlg_En.orc (added)
• cdlg_En.rc (deleted)
• cdlg_Eo.orc (added)
• cdlg_Eo.rc (deleted)
• cdlg_Es.orc (added)
• cdlg_Es.rc (deleted)
• cdlg_Fi.orc (added)
• cdlg_Fi.rc (deleted)
• cdlg_Fr.orc (added)
• cdlg_Fr.rc (deleted)
• cdlg_Hu.orc (added)
• cdlg_Hu.rc (deleted)
• cdlg_It.orc (added)
• cdlg_It.rc (deleted)
• cdlg_Ko.orc (added)
• cdlg_Ko.rc (deleted)
• cdlg_Nl.orc (added)
• cdlg_Nl.rc (deleted)
• cdlg_No.orc (added)
• cdlg_No.rc (deleted)
• cdlg_Pl.orc (added)
• cdlg_Pl.rc (deleted)
• cdlg_Pt.orc (added)
• cdlg_Pt.rc (deleted)
• cdlg_Ru.orc (added)
• cdlg_Ru.rc (deleted)
• cdlg_Sv.orc (added)
• cdlg_Sv.rc (deleted)
• cdlg_Wa.orc (added)
• cdlg_Wa.rc (deleted)
• cdlg_xx.orc (added)
• cdlg_xx.rc (deleted)
• makefile (modified) (1 diff)
• rsrc.orc (added)
• rsrc.rc (deleted)

trunk/src/comdlg32/makefile

@@ -1 @@
-# $Id: makefile,v 1.15 2000-02-09 23:46:53 bird Exp $
+# $Id: makefile,v 1.16 2000-03-06 23:38:30 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       comdlg32.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
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = rsrc.asm
 
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\comdlg32.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\cdlg32.obj \
+$(OBJDIR)\finddlg32.obj \
+$(OBJDIR)\filedlg95.obj \
+$(OBJDIR)\filedlgbrowser.obj \
+$(OBJDIR)\filetitle.obj \
+$(OBJDIR)\comdlgguid.obj \
+$(OBJDIR)\rsrc.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = comdlg32
 
-OBJS =  comdlg32.obj initterm.obj resource.obj cdlg32.obj finddlg32.obj filedlg95.obj \
-        filedlgbrowser.obj filetitle.obj comdlgguid.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)/odincrt.lib $(PDWIN32_LIB)/shlwapi.lib \
-          $(PDWIN32_LIB)/shell32.lib $(PDWIN32_LIB)/gdi32.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) $** $@
-
-resource.asm: rsrc.rc
-    $(RC) $(RCFLAGS) -o resource.asm rsrc.rc
+# 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 <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/pmwinx.lib
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/odincrt.lib
+$(PDWIN32_LIB)/shlwapi.lib
+$(PDWIN32_LIB)/shell32.lib
+$(PDWIN32_LIB)/gdi32.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