Changeset 4717 for trunk/src/ole32

Timestamp:

Dec 3, 2000, 12:45:13 AM (25 years ago)

Author:

bird

Message:

New makefile style. (addjustments)

Location:

trunk/src/ole32

Files:

• makefile (modified) (2 diffs)
• new/makefile (modified) (6 diffs)
• ole32.mak (modified) (4 diffs)
• regsvr32.mak (modified) (4 diffs)

trunk/src/ole32/makefile

@@ -1 @@
-# $Id: makefile,v 1.27 2000-11-19 09:05:15 bird Exp $
+# $Id: makefile,v 1.28 2000-12-02 23:40:42 bird Exp $
 
 #
@@ -11 +11 @@
 # Compiler, tools, and interference rules.
 #
-!include ../../include/pdwin32.mk
+!include ../../makefile.inc
 
 

trunk/src/ole32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 2000-04-27 22:21:36 davidr Exp $
+# $Id: makefile,v 1.2 2000-12-02 23:40:43 bird Exp $
 
 #
@@ -8 +8 @@
 
 
-# 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
+OLD_STYLE = 1
+!include ../../../makefile.inc
 
 
 # Flag overloads and local macros.
-CLEANEXTRAS = ole32rsrc.asm $(PDWIN32_BIN)\regsvr32.exe
+CLEANEXTRAS = ole32rsrc.asm $(ODIN32_BIN)\regsvr32.exe
 
 
@@ -68 +63 @@
 all:    $(OBJDIR) \
         $(OBJDIR)\$(TARGET).dll \
-        $(PDWIN32_BIN)\$(TARGET).dll \
+        $(ODIN32_BIN)\$(TARGET).dll \
         lib \
         $(OBJDIR)\regsvr32.exe \
-        $(PDWIN32_BIN)\regsvr32.exe
+        $(ODIN32_BIN)\regsvr32.exe
 
 
 # Lib rule - build importlibrary (and evt. other libs)
-lib: $(ORGTARGET).lib $(PDWIN32_LIB)\$(ORGTARGET).lib
+lib: $(ORGTARGET).lib $(ODIN32_LIB)\$(ORGTARGET).lib
 
 
@@ -89 +84 @@
 /MAP:$(OBJDIR)\$(TARGET).map
 $(OBJS)
-$(PDWIN32_LIB)/rpcrt4.lib
-$(PDWIN32_LIB)/user32.lib
-$(PDWIN32_LIB)/gdi32.lib
-$(PDWIN32_LIB)/comctl32.lib
-$(PDWIN32_LIB)/advapi32.lib
-$(PDWIN32_LIB)/kernel32.lib
-$(PDWIN32_LIB)/oleaut32.lib
-$(PDWIN32_LIB)/odincrt.lib
+$(ODIN32_LIB)/rpcrt4.lib
+$(ODIN32_LIB)/user32.lib
+$(ODIN32_LIB)/gdi32.lib
+$(ODIN32_LIB)/comctl32.lib
+$(ODIN32_LIB)/advapi32.lib
+$(ODIN32_LIB)/kernel32.lib
+$(ODIN32_LIB)/oleaut32.lib
+$(ODIN32_LIB)/odincrt.lib
 OS2386.LIB
 $(RTLLIB_O)
@@ -111 +106 @@
 
 $(OBJDIR)\regsvr32.exe:   $(OBJDIR)\regsvr32.obj regsvr32.def \
-                $(PDWIN32_LIB)/user32.lib \
-                $(PDWIN32_LIB)/kernel32.lib \
-                $(PDWIN32_LIB)/ole32.lib
+                $(ODIN32_LIB)/user32.lib \
+                $(ODIN32_LIB)/kernel32.lib \
+                $(ODIN32_LIB)/ole32.lib
     $(LD) $(LDFLAGS) -Ge+ -Fm -Fe$@ $** \
-        $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+        $(ODIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
 
-$(PDWIN32_BIN)\regsvr32.exe: $(OBJDIR)\regsvr32.exe
+$(ODIN32_BIN)\regsvr32.exe: $(OBJDIR)\regsvr32.exe
     $(CP) $** $@
 
@@ -123 +118 @@
 # 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
+    $(DEPEND) -I$(ODIN32_INCLUDE);$(ODIN32_INCLUDE)\win;. \
+        *.c *.cpp *.h *.asm *.inc $(ODIN32_INCLUDE)\*.h
 
 
 # Includes the common rules.
-!include $(PDWIN32_INCLUDE)/pdwin32.post
+!include $(ODIN32_POST_INC)
 

trunk/src/ole32/ole32.mak

@@ -1 @@
-# $Id: ole32.mak,v 1.2 2000-11-21 11:36:51 sandervl Exp $
+# $Id: ole32.mak,v 1.3 2000-12-02 23:40:43 bird Exp $
 
 #
@@ -16 +16 @@
 # Compiler, tools, and interference rules.
 #
-!include ../../include/pdwin32.mk
+!include ../../makefile.inc
 
 
@@ -61 +61 @@
 #
 LIBS = \
-$(PDWIN32_LIB)/rpcrt4.lib \
-$(PDWIN32_LIB)/user32.lib \
-$(PDWIN32_LIB)/gdi32.lib \
-$(PDWIN32_LIB)/comctl32.lib \
-$(PDWIN32_LIB)/advapi32.lib \
-$(PDWIN32_LIB)/kernel32.lib \
-$(PDWIN32_LIB)/oleaut32.lib \
-$(PDWIN32_LIB)/$(ODINCRT).lib \
+$(ODIN32_LIB)/rpcrt4.lib \
+$(ODIN32_LIB)/user32.lib \
+$(ODIN32_LIB)/gdi32.lib \
+$(ODIN32_LIB)/comctl32.lib \
+$(ODIN32_LIB)/advapi32.lib \
+$(ODIN32_LIB)/kernel32.lib \
+$(ODIN32_LIB)/oleaut32.lib \
+$(ODIN32_LIB)/$(ODINCRT).lib \
 OS2386.LIB \
 $(RTLLIB_O)
@@ -83 +83 @@
 # Includes the common rules.
 #
-!include $(PDWIN32_INCLUDE)/pdwin32.post
+!include $(ODIN32_POST_INC)
 

trunk/src/ole32/regsvr32.mak

@@ -1 @@
-# $Id: regsvr32.mak,v 1.1 2000-11-19 09:05:15 bird Exp $
+# $Id: regsvr32.mak,v 1.2 2000-12-02 23:40:43 bird Exp $
 
 #
@@ -19 +19 @@
 # Compiler, tools, and interference rules.
 #
-!include ../../include/pdwin32.mk
+!include ../../makefile.inc
 
 
@@ -33 +33 @@
 #
 LIBS = \
-$(PDWIN32_LIB)/user32.lib \
-$(PDWIN32_LIB)/kernel32.lib \
-$(PDWIN32_LIB)/ole32.lib \
-$(PDWIN32_LIB)/$(ODINCRT).lib \
+$(ODIN32_LIB)/user32.lib \
+$(ODIN32_LIB)/kernel32.lib \
+$(ODIN32_LIB)/ole32.lib \
+$(ODIN32_LIB)/$(ODINCRT).lib \
 OS2386.LIB \
 $(RTLLIB_O)
@@ -50 +50 @@
 # Includes the common rules.
 #
-!include $(PDWIN32_INCLUDE)/pdwin32.post
+!include $(ODIN32_POST_INC)