]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/makefile.g95
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added new project file having the new files
[wxWidgets.git] / src / msw / makefile.g95
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 49fd14dcaf8f6cafa7c5fc9e2ffe40d117ad77a3..d132ac33fcb1dc2812600077c09f5c02332efac7 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:57, 2000/09/08
+# This file was automatically generated by tmake at 20:55, 2001/07/13
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -25,7 +25,7 @@ WXDLL = $(WXDIR)/lib/wx$(WXVERSION).dll
 WXDEF = wx$(WXVERSION).def
 DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
                  $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
 WXDEF = wx$(WXVERSION).def
 DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
                  $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
-                     $(WXDIR)/lib/libxpm.a $(WXDIR)/lib/libtiff.a
+                    $(WXDIR)/lib/libtiff.a
 DLL_LDFLAGS = -L$(WXDIR)/lib
 DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
              -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
 DLL_LDFLAGS = -L$(WXDIR)/lib
 DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
              -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
@@ -43,7 +43,6 @@ HTMLDIR = $(WXDIR)/src/html
 ZLIBDIR = $(WXDIR)/src/zlib
 PNGDIR  = $(WXDIR)/src/png
 JPEGDIR = $(WXDIR)/src/jpeg
 ZLIBDIR = $(WXDIR)/src/zlib
 PNGDIR  = $(WXDIR)/src/png
 JPEGDIR = $(WXDIR)/src/jpeg
-XPMDIR  = $(WXDIR)/src/xpm
 TIFFDIR = $(WXDIR)/src/tiff
 OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
 TIFFDIR = $(WXDIR)/src/tiff
 OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
@@ -51,7 +50,6 @@ MSWDIR  = $(WXDIR)/src/msw
 ZLIBLIB = $(WXDIR)/lib/libzlib.a
 PNGLIB  = $(WXDIR)/lib/libpng.a
 JPEGLIB = $(WXDIR)/lib/libjpeg.a
 ZLIBLIB = $(WXDIR)/lib/libzlib.a
 PNGLIB  = $(WXDIR)/lib/libpng.a
 JPEGLIB = $(WXDIR)/lib/libjpeg.a
-XPMLIB  = $(WXDIR)/lib/libxpm.a
 TIFFLIB = $(WXDIR)/lib/libtiff.a
 
 DOCDIR = $(WXDIR)/docs
 TIFFLIB = $(WXDIR)/lib/libtiff.a
 
 DOCDIR = $(WXDIR)/docs
@@ -75,24 +73,26 @@ GENERICOBJS = \
                $(GENDIR)/dirctrlg.$(OBJSUFF) \
                $(GENDIR)/dragimgg.$(OBJSUFF) \
                $(GENDIR)/grid.$(OBJSUFF) \
                $(GENDIR)/dirctrlg.$(OBJSUFF) \
                $(GENDIR)/dragimgg.$(OBJSUFF) \
                $(GENDIR)/grid.$(OBJSUFF) \
+               $(GENDIR)/gridctrl.$(OBJSUFF) \
                $(GENDIR)/gridsel.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/logg.$(OBJSUFF) \
                $(GENDIR)/numdlgg.$(OBJSUFF) \
                $(GENDIR)/panelg.$(OBJSUFF) \
                $(GENDIR)/gridsel.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/logg.$(OBJSUFF) \
                $(GENDIR)/numdlgg.$(OBJSUFF) \
                $(GENDIR)/panelg.$(OBJSUFF) \
-               $(GENDIR)/plot.$(OBJSUFF) \
                $(GENDIR)/progdlgg.$(OBJSUFF) \
                $(GENDIR)/prop.$(OBJSUFF) \
                $(GENDIR)/propform.$(OBJSUFF) \
                $(GENDIR)/proplist.$(OBJSUFF) \
                $(GENDIR)/sashwin.$(OBJSUFF) \
                $(GENDIR)/progdlgg.$(OBJSUFF) \
                $(GENDIR)/prop.$(OBJSUFF) \
                $(GENDIR)/propform.$(OBJSUFF) \
                $(GENDIR)/proplist.$(OBJSUFF) \
                $(GENDIR)/sashwin.$(OBJSUFF) \
-               $(GENDIR)/scrolwin.$(OBJSUFF) \
+               $(GENDIR)/scrlwing.$(OBJSUFF) \
+               $(GENDIR)/spinctlg.$(OBJSUFF) \
                $(GENDIR)/splash.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \
                $(GENDIR)/tbarsmpl.$(OBJSUFF) \
                $(GENDIR)/textdlgg.$(OBJSUFF) \
                $(GENDIR)/tipdlg.$(OBJSUFF) \
                $(GENDIR)/splash.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \
                $(GENDIR)/tbarsmpl.$(OBJSUFF) \
                $(GENDIR)/textdlgg.$(OBJSUFF) \
                $(GENDIR)/tipdlg.$(OBJSUFF) \
+               $(GENDIR)/tipwin.$(OBJSUFF) \
                $(GENDIR)/treectlg.$(OBJSUFF) \
                $(GENDIR)/treelay.$(OBJSUFF) \
                $(GENDIR)/wizard.$(OBJSUFF)
                $(GENDIR)/treectlg.$(OBJSUFF) \
                $(GENDIR)/treelay.$(OBJSUFF) \
                $(GENDIR)/wizard.$(OBJSUFF)
@@ -103,6 +103,7 @@ COMMONOBJS  = \
                $(COMMDIR)/choiccmn.$(OBJSUFF) \
                $(COMMDIR)/clipcmn.$(OBJSUFF) \
                $(COMMDIR)/cmdline.$(OBJSUFF) \
                $(COMMDIR)/choiccmn.$(OBJSUFF) \
                $(COMMDIR)/clipcmn.$(OBJSUFF) \
                $(COMMDIR)/cmdline.$(OBJSUFF) \
+               $(COMMDIR)/cmdproc.$(OBJSUFF) \
                $(COMMDIR)/cmndata.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \
                $(COMMDIR)/cshelp.$(OBJSUFF) \
                $(COMMDIR)/cmndata.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \
                $(COMMDIR)/cshelp.$(OBJSUFF) \
@@ -111,8 +112,10 @@ COMMONOBJS  = \
                $(COMMDIR)/datetime.$(OBJSUFF) \
                $(COMMDIR)/datstrm.$(OBJSUFF) \
                $(COMMDIR)/db.$(OBJSUFF) \
                $(COMMDIR)/datetime.$(OBJSUFF) \
                $(COMMDIR)/datstrm.$(OBJSUFF) \
                $(COMMDIR)/db.$(OBJSUFF) \
+               $(COMMDIR)/dbgrid.$(OBJSUFF) \
                $(COMMDIR)/dbtable.$(OBJSUFF) \
                $(COMMDIR)/dcbase.$(OBJSUFF) \
                $(COMMDIR)/dbtable.$(OBJSUFF) \
                $(COMMDIR)/dcbase.$(OBJSUFF) \
+               $(COMMDIR)/dircmn.$(OBJSUFF) \
                $(COMMDIR)/dlgcmn.$(OBJSUFF) \
                $(COMMDIR)/dndcmn.$(OBJSUFF) \
                $(COMMDIR)/dobjcmn.$(OBJSUFF) \
                $(COMMDIR)/dlgcmn.$(OBJSUFF) \
                $(COMMDIR)/dndcmn.$(OBJSUFF) \
                $(COMMDIR)/dobjcmn.$(OBJSUFF) \
@@ -128,6 +131,7 @@ COMMONOBJS  = \
                $(COMMDIR)/file.$(OBJSUFF) \
                $(COMMDIR)/fileconf.$(OBJSUFF) \
                $(COMMDIR)/filefn.$(OBJSUFF) \
                $(COMMDIR)/file.$(OBJSUFF) \
                $(COMMDIR)/fileconf.$(OBJSUFF) \
                $(COMMDIR)/filefn.$(OBJSUFF) \
+               $(COMMDIR)/filename.$(OBJSUFF) \
                $(COMMDIR)/filesys.$(OBJSUFF) \
                $(COMMDIR)/fontcmn.$(OBJSUFF) \
                $(COMMDIR)/fontmap.$(OBJSUFF) \
                $(COMMDIR)/filesys.$(OBJSUFF) \
                $(COMMDIR)/fontcmn.$(OBJSUFF) \
                $(COMMDIR)/fontmap.$(OBJSUFF) \
@@ -136,6 +140,7 @@ COMMONOBJS  = \
                $(COMMDIR)/fs_mem.$(OBJSUFF) \
                $(COMMDIR)/fs_zip.$(OBJSUFF) \
                $(COMMDIR)/ftp.$(OBJSUFF) \
                $(COMMDIR)/fs_mem.$(OBJSUFF) \
                $(COMMDIR)/fs_zip.$(OBJSUFF) \
                $(COMMDIR)/ftp.$(OBJSUFF) \
+               $(COMMDIR)/gaugecmn.$(OBJSUFF) \
                $(COMMDIR)/gdicmn.$(OBJSUFF) \
                $(COMMDIR)/geometry.$(OBJSUFF) \
                $(COMMDIR)/gifdecod.$(OBJSUFF) \
                $(COMMDIR)/gdicmn.$(OBJSUFF) \
                $(COMMDIR)/geometry.$(OBJSUFF) \
                $(COMMDIR)/gifdecod.$(OBJSUFF) \
@@ -151,6 +156,7 @@ COMMONOBJS  = \
                $(COMMDIR)/imagpng.$(OBJSUFF) \
                $(COMMDIR)/imagpnm.$(OBJSUFF) \
                $(COMMDIR)/imagtiff.$(OBJSUFF) \
                $(COMMDIR)/imagpng.$(OBJSUFF) \
                $(COMMDIR)/imagpnm.$(OBJSUFF) \
                $(COMMDIR)/imagtiff.$(OBJSUFF) \
+               $(COMMDIR)/imagxpm.$(OBJSUFF) \
                $(COMMDIR)/intl.$(OBJSUFF) \
                $(COMMDIR)/ipcbase.$(OBJSUFF) \
                $(COMMDIR)/layout.$(OBJSUFF) \
                $(COMMDIR)/intl.$(OBJSUFF) \
                $(COMMDIR)/ipcbase.$(OBJSUFF) \
                $(COMMDIR)/layout.$(OBJSUFF) \
@@ -158,18 +164,23 @@ COMMONOBJS  = \
                $(COMMDIR)/list.$(OBJSUFF) \
                $(COMMDIR)/log.$(OBJSUFF) \
                $(COMMDIR)/longlong.$(OBJSUFF) \
                $(COMMDIR)/list.$(OBJSUFF) \
                $(COMMDIR)/log.$(OBJSUFF) \
                $(COMMDIR)/longlong.$(OBJSUFF) \
+               $(COMMDIR)/matrix.$(OBJSUFF) \
                $(COMMDIR)/memory.$(OBJSUFF) \
                $(COMMDIR)/menucmn.$(OBJSUFF) \
                $(COMMDIR)/mimecmn.$(OBJSUFF) \
                $(COMMDIR)/module.$(OBJSUFF) \
                $(COMMDIR)/mstream.$(OBJSUFF) \
                $(COMMDIR)/memory.$(OBJSUFF) \
                $(COMMDIR)/menucmn.$(OBJSUFF) \
                $(COMMDIR)/mimecmn.$(OBJSUFF) \
                $(COMMDIR)/module.$(OBJSUFF) \
                $(COMMDIR)/mstream.$(OBJSUFF) \
+               $(COMMDIR)/nbkbase.$(OBJSUFF) \
                $(COMMDIR)/object.$(OBJSUFF) \
                $(COMMDIR)/objstrm.$(OBJSUFF) \
                $(COMMDIR)/paper.$(OBJSUFF) \
                $(COMMDIR)/object.$(OBJSUFF) \
                $(COMMDIR)/objstrm.$(OBJSUFF) \
                $(COMMDIR)/paper.$(OBJSUFF) \
+               $(COMMDIR)/popupcmn.$(OBJSUFF) \
                $(COMMDIR)/prntbase.$(OBJSUFF) \
                $(COMMDIR)/process.$(OBJSUFF) \
                $(COMMDIR)/protocol.$(OBJSUFF) \
                $(COMMDIR)/quantize.$(OBJSUFF) \
                $(COMMDIR)/prntbase.$(OBJSUFF) \
                $(COMMDIR)/process.$(OBJSUFF) \
                $(COMMDIR)/protocol.$(OBJSUFF) \
                $(COMMDIR)/quantize.$(OBJSUFF) \
+               $(COMMDIR)/radiocmn.$(OBJSUFF) \
+               $(COMMDIR)/regex.$(OBJSUFF) \
                $(COMMDIR)/resource.$(OBJSUFF) \
                $(COMMDIR)/sckaddr.$(OBJSUFF) \
                $(COMMDIR)/sckfile.$(OBJSUFF) \
                $(COMMDIR)/resource.$(OBJSUFF) \
                $(COMMDIR)/sckaddr.$(OBJSUFF) \
                $(COMMDIR)/sckfile.$(OBJSUFF) \
@@ -181,6 +192,7 @@ COMMONOBJS  = \
                $(COMMDIR)/strconv.$(OBJSUFF) \
                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \
                $(COMMDIR)/strconv.$(OBJSUFF) \
                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \
+               $(COMMDIR)/sysopt.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \
                $(COMMDIR)/textcmn.$(OBJSUFF) \
                $(COMMDIR)/textfile.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \
                $(COMMDIR)/textcmn.$(OBJSUFF) \
                $(COMMDIR)/textfile.$(OBJSUFF) \
@@ -199,6 +211,7 @@ COMMONOBJS  = \
                $(COMMDIR)/wincmn.$(OBJSUFF) \
                $(COMMDIR)/wxchar.$(OBJSUFF) \
                $(COMMDIR)/wxexpr.$(OBJSUFF) \
                $(COMMDIR)/wincmn.$(OBJSUFF) \
                $(COMMDIR)/wxchar.$(OBJSUFF) \
                $(COMMDIR)/wxexpr.$(OBJSUFF) \
+               $(COMMDIR)/xpmdecod.$(OBJSUFF) \
                $(COMMDIR)/zipstrm.$(OBJSUFF) \
                $(COMMDIR)/zstream.$(OBJSUFF)
 
                $(COMMDIR)/zipstrm.$(OBJSUFF) \
                $(COMMDIR)/zstream.$(OBJSUFF)
 
@@ -256,6 +269,7 @@ MSWOBJS     = \
                $(MSWDIR)/dir.$(OBJSUFF) \
                $(MSWDIR)/dragimag.$(OBJSUFF) \
                $(MSWDIR)/enhmeta.$(OBJSUFF) \
                $(MSWDIR)/dir.$(OBJSUFF) \
                $(MSWDIR)/dragimag.$(OBJSUFF) \
                $(MSWDIR)/enhmeta.$(OBJSUFF) \
+               $(MSWDIR)/evtloop.$(OBJSUFF) \
                $(MSWDIR)/filedlg.$(OBJSUFF) \
                $(MSWDIR)/font.$(OBJSUFF) \
                $(MSWDIR)/fontdlg.$(OBJSUFF) \
                $(MSWDIR)/filedlg.$(OBJSUFF) \
                $(MSWDIR)/font.$(OBJSUFF) \
                $(MSWDIR)/fontdlg.$(OBJSUFF) \
@@ -299,6 +313,7 @@ MSWOBJS     = \
                $(MSWDIR)/scrolbar.$(OBJSUFF) \
                $(MSWDIR)/settings.$(OBJSUFF) \
                $(MSWDIR)/slider95.$(OBJSUFF) \
                $(MSWDIR)/scrolbar.$(OBJSUFF) \
                $(MSWDIR)/settings.$(OBJSUFF) \
                $(MSWDIR)/slider95.$(OBJSUFF) \
+               $(MSWDIR)/snglinst.$(OBJSUFF) \
                $(MSWDIR)/spinbutt.$(OBJSUFF) \
                $(MSWDIR)/spinctrl.$(OBJSUFF) \
                $(MSWDIR)/statbmp.$(OBJSUFF) \
                $(MSWDIR)/spinbutt.$(OBJSUFF) \
                $(MSWDIR)/spinctrl.$(OBJSUFF) \
                $(MSWDIR)/statbmp.$(OBJSUFF) \
@@ -310,6 +325,7 @@ MSWOBJS     = \
                $(MSWDIR)/taskbar.$(OBJSUFF) \
                $(MSWDIR)/tbar95.$(OBJSUFF) \
                $(MSWDIR)/textctrl.$(OBJSUFF) \
                $(MSWDIR)/taskbar.$(OBJSUFF) \
                $(MSWDIR)/tbar95.$(OBJSUFF) \
                $(MSWDIR)/textctrl.$(OBJSUFF) \
+               $(MSWDIR)/tglbtn.$(OBJSUFF) \
                $(MSWDIR)/thread.$(OBJSUFF) \
                $(MSWDIR)/timer.$(OBJSUFF) \
                $(MSWDIR)/tooltip.$(OBJSUFF) \
                $(MSWDIR)/thread.$(OBJSUFF) \
                $(MSWDIR)/timer.$(OBJSUFF) \
                $(MSWDIR)/tooltip.$(OBJSUFF) \
@@ -317,8 +333,7 @@ MSWOBJS     = \
                $(MSWDIR)/utils.$(OBJSUFF) \
                $(MSWDIR)/utilsexc.$(OBJSUFF) \
                $(MSWDIR)/wave.$(OBJSUFF) \
                $(MSWDIR)/utils.$(OBJSUFF) \
                $(MSWDIR)/utilsexc.$(OBJSUFF) \
                $(MSWDIR)/wave.$(OBJSUFF) \
-               $(MSWDIR)/window.$(OBJSUFF) \
-               $(MSWDIR)/xpmhand.$(OBJSUFF)
+               $(MSWDIR)/window.$(OBJSUFF)
 
 ADVANCEDOBJS     = \
                $(COMMDIR)/odbc.$(OBJSUFF) \
 
 ADVANCEDOBJS     = \
                $(COMMDIR)/odbc.$(OBJSUFF) \
@@ -411,27 +426,6 @@ JPEGOBJS    = \
                $(JPEGDIR)/jquant2.$(OBJSUFF) \
                $(JPEGDIR)/jdmerge.$(OBJSUFF)
 
                $(JPEGDIR)/jquant2.$(OBJSUFF) \
                $(JPEGDIR)/jdmerge.$(OBJSUFF)
 
-# NOTE: these filenames are case sensitive!
-XPMOBJS =    $(XPMDIR)/Attrib.o\
-               $(XPMDIR)/CrBufFrI.o\
-               $(XPMDIR)/CrDatFrI.o\
-               $(XPMDIR)/create.o\
-               $(XPMDIR)/CrIFrBuf.o\
-               $(XPMDIR)/CrIFrDat.o\
-               $(XPMDIR)/data.o\
-               $(XPMDIR)/Image.o\
-               $(XPMDIR)/Info.o\
-               $(XPMDIR)/hashtab.o\
-               $(XPMDIR)/misc.o\
-               $(XPMDIR)/parse.o\
-               $(XPMDIR)/RdFToDat.o\
-               $(XPMDIR)/RdFToI.o\
-               $(XPMDIR)/rgb.o\
-               $(XPMDIR)/scan.o\
-               $(XPMDIR)/simx.o\
-               $(XPMDIR)/WrFFrDat.o\
-               $(XPMDIR)/WrFFrI.o
-
 TIFFOBJS = $(TIFFDIR)/tif_aux.o \
                $(TIFFDIR)/tif_close.o \
                $(TIFFDIR)/tif_codec.o \
 TIFFOBJS = $(TIFFDIR)/tif_aux.o \
                $(TIFFDIR)/tif_close.o \
                $(TIFFDIR)/tif_codec.o \
@@ -477,9 +471,9 @@ else
 endif
 
 ifndef WXMAKINGDLL
 endif
 
 ifndef WXMAKINGDLL
-all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB)
+all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB)
 else
 else
-all:    $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) $(WXDLL)
+all:    $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(WXDLL)
 endif
 
 ifndef WXMAKINGDLL
 endif
 
 ifndef WXMAKINGDLL
@@ -545,10 +539,6 @@ $(JPEGLIB): $(JPEGOBJS)
        $(AR) $(AROPTIONS) $@ $(JPEGOBJS)
        $(RANLIB) $@
 
        $(AR) $(AROPTIONS) $@ $(JPEGOBJS)
        $(RANLIB) $@
 
-$(XPMLIB): $(XPMOBJS)
-       $(AR) $(AROPTIONS) $@ $(XPMOBJS)
-       $(RANLIB) $@
-
 $(TIFFLIB): $(TIFFOBJS)
        $(AR) $(AROPTIONS) $@ $(TIFFOBJS)
        $(RANLIB) $@
 $(TIFFLIB): $(TIFFOBJS)
        $(AR) $(AROPTIONS) $@ $(TIFFOBJS)
        $(RANLIB) $@
@@ -613,15 +603,14 @@ clean:
        -$(RM) ../png/*.bak
        -$(RM) ../jpeg/*.o
        -$(RM) ../jpeg/*.bak
        -$(RM) ../png/*.bak
        -$(RM) ../jpeg/*.o
        -$(RM) ../jpeg/*.bak
-       -$(RM) ../xpm/*.o
-       -$(RM) ../xpm/*.bak
        -$(RM) ../tiff/*.o
        -$(RM) ../tiff/*.bak
        -$(RM) ../tiff/*.o
        -$(RM) ../tiff/*.bak
+
+cleanall: clean
        -$(RM) $(WXLIB)
        -$(RM) $(ZLIBLIB)
        -$(RM) $(PNGLIB)
        -$(RM) $(JPEGLIB)
        -$(RM) $(WXLIB)
        -$(RM) $(ZLIBLIB)
        -$(RM) $(PNGLIB)
        -$(RM) $(JPEGLIB)
-       -$(RM) $(XPMLIB)
        -$(RM) $(TIFFLIB)
 
 ifdef WXMAKINGDLL
        -$(RM) $(TIFFLIB)
 
 ifdef WXMAKINGDLL
@@ -633,7 +622,3 @@ ifneq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
 endif
 endif
 
 endif
 endif
 
-
-cleanall: clean
-
-
wxWidgets (Impactor)