First attempt at clean-up

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/makelib.b32

@@ -14,18 +14,14 @@ WXDIR = $(WXWIN)
 
 !include $(WXDIR)\src\makeb32.env
 
+lib: $(LIBTARGET)
+   
 $(LIBTARGET): $(OBJECTS)
-        -erase $(LIBTARGET)
+   -erase $(LIBTARGET)
-	tlib $(LIBTARGET) /P512 @&&!
+   tlib $(LIBTARGET) /P512 @&&!
--+$(OBJECTS:.obj =.obj -+)
++$(OBJECTS:.obj =.obj +)
 !
 
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
 clean:
         -erase *.obj
         -erase *.exe

src/msw/makefile.b32

@@ -267,7 +267,7 @@ all:	all_libs all_execs
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
         -erase $(LIBTARGET)
 	tlib $(LIBTARGET) /P512 @&&!
--+$(OBJECTS:.obj =.obj -+) -+$(PERIPH_LIBS:.lib =.lib -+)
++$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
 
 !else

src/png/makefile.b32

@@ -11,72 +11,10 @@
 
 # WXWIN and BCCDIR are set by parent make
 
-WXDIR = $(WXWIN)
+LIBTARGET =..\..\lib\winpng.lib
-!include $(WXDIR)\src\makeb32.env
-
-WINPNGLIB = ..\..\lib\winpng.lib
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib 
-
-!if "$(FINAL)" == "0"
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
 
 OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \
- pngpread.obj pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj \
+          pngpread.obj pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj \
- pngerror.obj pngmem.obj pngwio.obj pngrio.obj pngget.obj pngset.obj
+          pngerror.obj pngmem.obj pngwio.obj pngrio.obj pngget.obj pngset.obj
-
-all: $(WINPNGLIB)
-
-$(WINPNGLIB): $(OBJECTS) 
-        -erase $(WINPNGLIB)
-	tlib $(WINPNGLIB) /P512 @&&!
--+$(OBJECTS:.obj =.obj -+) 
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-$(CFG): makefile.b32
-	copy &&!
--3
--P
--d
--w-hid
--w-par
--w-pia
--w-aus
--w-rch
--Oxt
--WE
-
--I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib
--I$(WXDIR)\include\wx\msw\gnuwin32
-
--L$(BCCDIR)\lib
--D__WXWIN__
--D__WXMSW__
--D__WINDOWS__
--DWIN32
-$(OPT)
-$(DEBUG_FLAGS)
-$(WIN95FLAG)
-! $(CFG)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 
+!include $(WXWIN)\src\makelib.b32

src/zlib/makefile.b32

@@ -13,97 +13,12 @@
 # See zconf.h for details about the memory requirements.
 
 # ------------- Borland C++ -------------
-MODEL=-WX 
-CFLAGS= $(MODEL) -P-C -K -N- -k- -d -3 -r- -v- -f -DMSDOS
-CC=bcc32
-LD=bcc32
-LIB=tlib
-LDFLAGS= $(MODEL)
-O=.obj
 
 LIBTARGET=..\..\lib\zlib.lib
 
-# variables
+OBJECTS = adler32.obj compress.obj crc32.obj gzio.obj uncompr.obj deflate.obj \
-OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
+          trees.obj zutil.obj inflate.obj infblock.obj inftrees.obj infcodes.obj \
-  trees$(O)
+          infutil.obj inffast.obj
-OBJP1 = adler32$(O)+compress$(O)+crc32$(O)+gzio$(O)+uncompr$(O)+deflate$(O)+\
-  trees$(O)
-OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
-  infutil$(O) inffast$(O)
-OBJP2 = zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)+\
-  infutil$(O)+inffast$(O)
 
-all: test
+!include $(WXWIN)\src\makelib.b32
 
-adler32.obj: adler32.c zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-compress.obj: compress.c zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-crc32.obj: crc32.c zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-gzio.obj: gzio.c zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\
-   infcodes.h infutil.h
-	$(CC) -c $(CFLAGS) $*.c
-
-infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\
-   infcodes.h inffast.h
-	$(CC) -c $(CFLAGS) $*.c
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
-	$(CC) -c $(CFLAGS) $*.c
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-	$(CC) -c $(CFLAGS) $*.c
-
-infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
-	$(CC) -c $(CFLAGS) $*.c
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
-	$(CC) -c $(CFLAGS) $*.c
-
-trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-example.obj: example.c zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-minigzip.obj: minigzip.c zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-lib:    $(LIBTARGET)
-
-# we must cut the command line to fit in the MS/DOS 128 byte limit:
-$(LIBTARGET): $(OBJ1) $(OBJ2)
-	del $(LIBTARGET)
-	$(LIB) $(LIBTARGET) +$(OBJP1)
-	$(LIB) $(LIBTARGET) +$(OBJP2)
-
-example.exe: example.obj $(LIBTARGET)
-	$(LD) $(LDFLAGS) example.obj $(LIBTARGET)
-
-minigzip.exe: minigzip.obj $(LIBTARGET)
-	$(LD) $(LDFLAGS) minigzip.obj $(LIBTARGET)
-
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d 
-
-clean:
-	-erase *.obj
-	-erase *.exe
-   -erase $(LIBTARGET)