Changeset 174 for sbliveos2/trunk/lib32

Timestamp:

Apr 14, 2001, 6:26:09 PM (24 years ago)

Author:

sandervl

Message:

makefile updates

File:

• sbliveos2/trunk/lib32/makefile.os2 (modified) (3 diffs)

sbliveos2/trunk/lib32/makefile.os2

@@ -1 @@
-INC     = $(%WATCOM)\H;..\include;..\runtime;..\sblive
-INCA    = $(%DDK)\BASE\H
+CINCLUDES = $(%WATCOM)\H;..\include;..\runtime;..\sblive
+AINCLUDES = $(%DDK)\BASE\H
 
-#===================================================================
-#
-#   Auto-dependency information
-#
-#===================================================================
-.ERASE
-.SUFFIXES:
-.SUFFIXES: .lst .obj .cpp .c .asm
+CDEFINES = -D__KERNEL__ -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2
 
-!if "$(DEBUG)" == "1"
-CFLAGS  = -D__KERNEL__ -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2  -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
-!else
-CFLAGS  = -D__KERNEL__ -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2 -bt=os2v2 -e60 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
-!endif
+32BIT=1
+!include ..\makefile.inc
+!include ..\include\sblive32.mak
 
-ASFLAGS = -Mb -Li -Sv:ALP
-
-!if "$(KEE)" == "1"
-CFLAGS  = $(CFLAGS) -mf -DKEE
-ASFLAGS = $(ASFLAGS) -D:KEE
-!else
-CFLAGS  = $(CFLAGS) -mc -zu
-!endif
-
-CC      = WCC386 $(CFLAGS) $(IWC)
-CPP     = WPP386 $(CFLAGS) $(IWC)
-ASM     = alp $(ASFLAGS) $(INCA)
-
-DFLAGS  = -l -s
-DIS     = WDISASM $(DFLAGS)
-
-!if "$(DEBUG)" == "1"
-LFLAGS  = system os2v2 physdevice option int, dosseg, map, eliminate, mang, tog sort global d codeview
-!else
-LFLAGS  = system os2v2 physdevice option int, dosseg, map, eliminate, mang, tog sort global
-!endif
-QFLAGS  = system os2 option quiet, map, align=512
-LINK    = WLINK $(LFLAGS)
-
-BFLAGS  = -c -b -q -n
-LIB     = WLIB $(BFLAGS)
-
-.obj.lst:
-        $(DIS) $*
-
-.cpp.obj: .AUTODEPEND
-        $(CPP) $*.cpp
-
-.c.obj: .AUTODEPEND
-        $(CC) $*.c
-
-.asm.obj: .AUTODEPEND
-        $(ASM) $*.asm -Fl:$*.lst
 
 #===================================================================
@@ -71 +24 @@
 FILELAST =
 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9)
+
+!if "$(KEE)" == "1"
+TARGET   = linuxlibkee
+!else
 TARGET   = linuxlib
+!endif
 
+LNKFILE  = $(OBJDIR)\$(TARGET).lnk
 
 
@@ -80 +39 @@
 #
 #===================================================================
-all: $(TARGET).lib
+all: $(OBJDIR)\$(TARGET).lib
 
 
-$(TARGET).lnk: makefile.os2
-    @%create $(TARGET).lnk
-    @for %f in ($(FILES)) do @%append $(TARGET).lnk -+%f
+$(LNKFILE): makefile.os2
+    @%create $(LNKFILE)
+    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
 
-$(TARGET).lib: $(TARGET).lnk $(FILES)
-    $(LIB) $(TARGET).lib @$(TARGET).lnk
+$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
+    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
+    copy $(OBJDIR)\$(TARGET).lib $(SBLIVE_LIB)
+
 
 clean:
+     cd $(OBJDIR)
      del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
+     cd ..