in the process of converting xlib into watcom friendly

[16.git] / 16 / xlib / makefile

diff --git a/16/xlib/makefile b/16/xlib/makefile
index bb99010b2823df8d29e69d28fa07bc774780488d..cba0dcac040881c9b129875c19142a21bebc4b0c 100755 (executable)
--- a/16/xlib/makefile
+++ b/16/xlib/makefile
@@ -19,28 +19,23 @@ XLIB_VERSION=06w
 # Set the compiler: either BCC or TCC\r
 #\r
 CC=wcl\r
-\r
 LIB=wlib\r
 \r
 AFLAGS  = -0 -m$(MODEL)\r
 CFLAGS  = -0 -mh\r
 CPPFLAGS= -0 -m$(MODEL)\r
-LDFLAGS = -m$(MODEL)\r
-\r
+LDFLAGS = -0 -m$(MODEL)\r
 \r
 #%.$(OBJ): %.c\r
 #      $(CC) -c $(CFLAGS) $<\r
 \r
-#%.$(OBJ): *.asm\r
-#      wasm $(AFLAGS) $* \\r
-\r
-$(OBJ)\r
-\r
+# $*$(OBJ).asm#: $*.asm#\r
+#      wasm $(AFLAGS) $* \\r
 \r
+EXEC=demo1.exe demo2.exe demo3.exe demo4.exe demo5.exe demo6.exe demo7.exe demo8.exe# demo9.exe demo10.exe\r
 XLIBOBJS= xprintf.$(OBJ) xpoint.$(OBJ) xline.$(OBJ) xmain.$(OBJ) xpal.$(OBJ) xpbitmap.$(OBJ) xrect.$(OBJ) xtext.$(OBJ) xcbitmap.$(OBJ) xdetect.$(OBJ) xbmtools.$(OBJ) xfileio.$(OBJ) xrletool.$(OBJ) xbezier.$(OBJ) xpbmclip.$(OBJ) xvbitmap.$(OBJ) xmakevbm.$(OBJ) xmouse.$(OBJ) xcircle.$(OBJ) xclippbm.$(OBJ) xcomppbm.$(OBJ) xpolygon.$(OBJ) xvsync.$(OBJ) xfill.$(OBJ) xcbitm32.$(OBJ)\r
 \r
-\r
-all: demo1.exe demo2.exe demo3.exe demo4.exe demo5.exe demo6.exe demo7.exe demo8.exe# demo9.exe demo10.exe\r
+all: $(XLIBOBJS) $(EXEC)\r
 \r
 demo1.exe : demo1.$(OBJ) $(XLIBOBJS) $(XLIBOBJS)#xlib$(XLIB_VERSION)$(MODEL).lib\r
        $(CC) $(CFLAGS) demo1.$(OBJ) $(XLIBOBJS)#xlib$(XLIB_VERSION)$(MODEL).lib\r
@@ -108,52 +103,52 @@ demo8.$(OBJ) : demo8.c
 xprintf.$(OBJ) : xprintf.c\r
        $(CC) -c $(CFLAGS) xprintf.c\r
 \r
-xpoint.$(OBJ)  : xpoint.asm    xpoint.inc      xlib.inc  model.inc\r
-       $(CC) -c $(CFLAGS) xpoint.asm   xpoint.inc      xlib.inc  model.inc\r
-xline.$(OBJ)   : xline.asm      xline.inc       xlib.inc  model.inc\r
-       $(CC) -c $(CFLAGS)  xline.asm    xline.inc       xlib.inc  model.inc\r
-xmain.$(OBJ): xmain.asm         xmain.inc       xlib.inc  model.inc\r
-       $(CC) -c $(CFLAGS) xmain.asm     xmain.inc       xlib.inc  model.inc\r
-xpal.$(OBJ)     : xpal.asm       xpal.inc        xlib.inc  model.inc\r
-       $(CC) -c $(CFLAGS) xpal.asm       xpal.inc        xlib.inc  model.inc\r
-xpbitmap.$(OBJ): xpbitmap.asm xpbitmap.inc xlib.inc  model.inc\r
-       $(CC) -c $(CFLAGS) xpbitmap.asm xpbitmap.inc xlib.inc  model.inc\r
-xpbmclip.$(OBJ): xpbmclip.asm xpbmclip.inc xlib.inc  model.inc\r
-       $(CC) -c $(CFLAGS) xpbmclip.asm xpbmclip.inc xlib.inc  model.inc\r
-xclippbm.$(OBJ): xclippbm.asm xclippbm.inc xlib.inc  model.inc\r
-       $(CC) -c $(CFLAGS) xclippbm.asm xclippbm.inc xlib.inc  model.inc\r
-xrect.$(OBJ): xpal.asm   xpal.inc        xlib.inc  model.inc\r
-       $(CC) -c $(CFLAGS) xpal.asm       xpal.inc        xlib.inc  model.inc\r
-xtext.$(OBJ): xtext.asm         xtext.inc       xlib.inc  model.inc\r
-       $(CC) -c $(CFLAGS) xtext.asm     xtext.inc       xlib.inc  model.inc\r
-xcbitmap.$(OBJ): xcbitmap.asm xcbitmap.inc xlib.inc  model.inc\r
-       $(CC) -c $(CFLAGS) xcbitmap.asm xcbitmap.inc xlib.inc  model.inc\r
-xcomppbm.$(OBJ): xcomppbm.asm xcomppbm.inc xlib.inc  model.inc\r
-       $(CC) -c $(CFLAGS) xcomppbm.asm xcomppbm.inc xlib.inc  model.inc\r
+xpoint.$(OBJ)  : xpoint.asm##                  xpoint.inc      xlib.inc                model.inc\r
+       $(CC) -c $(CFLAGS) xpoint.asm## xpoint.inc      xlib.inc                model.inc\r
+xline.$(OBJ) : xline.asm#                              xline.inc               xlib.inc                model.inc\r
+       $(CC) -c $(CFLAGS)  xline.asm#  xline.inc               xlib.inc                model.inc\r
+xmain.$(OBJ): xmain.asm#                       xmain.inc       xlib.inc                model.inc\r
+       $(CC) -c $(CFLAGS) xmain.asm#   xmain.inc       xlib.inc                model.inc\r
+xpal.$(OBJ)     : xpal.asm#                            xpal.inc                xlib.inc                model.inc\r
+       $(CC) -c $(CFLAGS) xpal.asm#    xpal.inc                xlib.inc                model.inc\r
+xpbitmap.$(OBJ): xpbitmap.asm#         xpbitmap.inc    xlib.inc                model.inc\r
+       $(CC) -c $(CFLAGS) xpbitmap.asm#        xpbitmap.inc    xlib.inc                model.inc\r
+xpbmclip.$(OBJ): xpbmclip.asm#                 xpbmclip.inc    xlib.inc                model.inc\r
+       $(CC) -c $(CFLAGS) xpbmclip.asm# xpbmclip.inc   xlib.inc                model.inc\r
+xclippbm.$(OBJ): xclippbm.asm#         xclippbm.inc    xlib.inc                model.inc\r
+       $(CC) -c $(CFLAGS) xclippbm.asm# xclippbm.inc   xlib.inc                model.inc\r
+xrect.$(OBJ): xpal.asm#                                xpal.inc                xlib.inc                model.inc\r
+       $(CC) -c $(CFLAGS) xpal.asm#    xpal.inc                xlib.inc                model.inc\r
+xtext.$(OBJ): xtext.asm#                               xtext.inc       xlib.inc                model.inc\r
+       $(CC) -c $(CFLAGS) xtext.asm#   xtext.inc       xlib.inc                model.inc\r
+xcbitmap.$(OBJ): xcbitmap.asm#         xcbitmap.inc    xlib.inc                model.inc\r
+       $(CC) -c $(CFLAGS) xcbitmap.asm#        xcbitmap.inc    xlib.inc                model.inc\r
+xcomppbm.$(OBJ): xcomppbm.asm# xcomppbm.inc xlib.inc                   model.inc\r
+       $(CC) -c $(CFLAGS) xcomppbm.asm# xcomppbm.inc xlib.inc  model.inc\r
 xcbitm32.$(OBJ): xcbitm32.c\r
        $(CC) -c $(CFLAGS) xcbitm32.c\r
-xdetect.$(OBJ) : xdetect.asm  xdetect.inc                              model.inc\r
-       $(CC) -c $(CFLAGS) xdetect.asm  xdetect.inc                             model.inc\r
-xbmtools.$(OBJ): xbmtools.asm xbmtools.inc                       model.inc\r
-       $(CC) -c $(CFLAGS) xbmtools.asm xbmtools.inc                      model.inc\r
-xfileio.$(OBJ) : xfileio.asm  xfileio.inc                              model.inc\r
-       $(CC) -c $(CFLAGS) xfileio.asm  xfileio.inc                             model.inc\r
-xrletool.$(OBJ): xrletool.asm xrletool.inc                       model.inc\r
-       $(CC) -c $(CFLAGS) xrletool.asm xrletool.inc                      model.inc\r
-xvbitmap.$(OBJ): xvbitmap.asm xvbitmap.inc xlib.inc  model.inc\r
-       $(CC) -c $(CFLAGS) xvbitmap.asm xvbitmap.inc xlib.inc  model.inc\r
+xdetect.$(OBJ) : xdetect.asm#                  xdetect.inc                     model.inc\r
+       $(CC) -c $(CFLAGS) xdetect.asm# xdetect.inc                     model.inc\r
+xbmtools.$(OBJ): xbmtools.asm#         xbmtools.inc                    model.inc\r
+       $(CC) -c $(CFLAGS) xbmtools.asm#         xbmtools.inc                   model.inc\r
+xfileio.$(OBJ) : xfileio.asm#                  xfileio.inc                     model.inc\r
+       $(CC) -c $(CFLAGS) xfileio.asm# xfileio.inc                     model.inc\r
+xrletool.$(OBJ): xrletool.asm#                 xrletool.inc                    model.inc\r
+       $(CC) -c $(CFLAGS) xrletool.asm#        xrletool.inc                    model.inc\r
+xvbitmap.$(OBJ): xvbitmap.asm#         xvbitmap.inc xlib.inc   model.inc\r
+       $(CC) -c $(CFLAGS) xvbitmap.asm#        xvbitmap.inc xlib.inc   model.inc\r
 xmakevbm.$(OBJ): xmakevbm.c    xvbitmap.h\r
        $(CC) -c $(CFLAGS) xmakevbm.c   xvbitmap.h\r
-xmouse.$(OBJ)  : xmouse.asm                                     xlib.inc  model.inc\r
-       $(CC) -c $(CFLAGS) xmouse.asm                                    xlib.inc  model.inc\r
-xcircle.$(OBJ) : xcircle.asm  xcircle.inc  xlib.inc  model.inc\r
-       $(CC) -c $(CFLAGS) xcircle.asm  xcircle.inc  xlib.inc  model.inc\r
-xpolygon.$(OBJ): xpolygon.asm xpolygon.inc xlib.inc  model.inc\r
-       $(CC) -c $(CFLAGS) xpolygon.asm xpolygon.inc xlib.inc  model.inc\r
-xvsync.$(OBJ)  : xvsync.asm    xvsync.inc      xlib.inc  model.inc\r
-       $(CC) -c $(CFLAGS) xvsync.asm   xvsync.inc      xlib.inc  model.inc\r
-xfill.$(OBJ)   : xfill.asm      xfill.inc       xlib.inc  model.inc\r
-       $(CC) -c $(CFLAGS) xfill.asm     xfill.inc       xlib.inc  model.inc\r
+xmouse.$(OBJ)  : xmouse.asm#                   xlib.inc                                model.inc\r
+       $(CC) -c $(CFLAGS) xmouse.asm#  xlib.inc                                model.inc\r
+xcircle.$(OBJ) : xcircle.asm#                  xcircle.inc xlib.inc    model.inc\r
+       $(CC) -c $(CFLAGS) xcircle.asm# xcircle.inc xlib.inc    model.inc\r
+xpolygon.$(OBJ): xpolygon.asm#         xpolygon.inc xlib.inc   model.inc\r
+       $(CC) -c $(CFLAGS) xpolygon.asm# xpolygon.inc xlib.inc  model.inc\r
+xvsync.$(OBJ)  : xvsync.asm#                   xvsync.inc xlib.inc     model.inc\r
+       $(CC) -c $(CFLAGS) xvsync.asm#  xvsync.inc xlib.inc     model.inc\r
+xfill.$(OBJ)   : xfill.asm#                            xfill.inc       xlib.inc                model.inc\r
+       $(CC) -c $(CFLAGS) xfill.asm#   xfill.inc       xlib.inc                model.inc\r
 \r
 #\r
 #other~\r