X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc6c62a931cd31cff4bd7c621301d443a41dee5c..a9775f1f58c58c763953d411c473bc2ee73051fb:/distrib/msw/tmake/unx.t
diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t
index 4293522b84..11719f36d1 100644
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -6,7 +6,6 @@
#! Created: 14.07.99
#! Version: $Id$
#!################################################################################
-
#${
#! include the code which parses filelist.txt file and initializes
#! %wxCommon, %wxGeneric, %wxHtml, %wxUnix and %wxGTK hashes.
@@ -21,22 +20,32 @@
next unless $file =~ /^dirdlgg\./;
}
+ $file2 = $file;
$file =~ s/cp?p?$/\o/;
- $project{"WXMSW_GENERICOBJS"} .= "src/generic/" . $file . " "
+ $file2 =~ s/cp?p?$/\d/;
+ $project{"WXMSW_GENERICOBJS"} .= $file . " ";
+ $project{"WXMSW_GENERICDEPS"} .= $file2 . " "
}
foreach $file (sort keys %wxGeneric) {
+ #! skip generic files not required for the wxGTK port
next if $wxGeneric{$file} =~ /\bR\b/;
+ $file2 = $file;
$file =~ s/cp?p?$/\o/;
- $project{"WXGTK_GENERICOBJS"} .= "src/generic/" . $file . " "
+ $file2 =~ s/cp?p?$/\d/;
+ $project{"WXGTK_GENERICOBJS"} .= $file . " ";
+ $project{"WXGTK_GENERICDEPS"} .= $file2 . " "
}
foreach $file (sort keys %wxGeneric) {
- next if $wxCommon{$file} =~ /\bX\b/;
+ next if $wxGeneric{$file} =~ /\bX\b/;
+ $file2 = $file;
$file =~ s/cp?p?$/\o/;
- $project{"WXMOTIF_GENERICOBJS"} .= "src/generic/" . $file . " "
+ $file2 =~ s/cp?p?$/\d/;
+ $project{"WXMOTIF_GENERICOBJS"} .= $file . " ";
+ $project{"WXMOTIF_GENERICDEPS"} .= $file2 . " "
}
#! Common
@@ -44,15 +53,21 @@
foreach $file (sort keys %wxCommon) {
next if $wxCommon{$file} =~ /\bR\b/;
+ $file2 = $file;
$file =~ s/cp?p?$/\o/;
- $project{"WXGTK_COMMONOBJS"} .= "src/common/" . $file . " "
+ $file2 =~ s/cp?p?$/\d/;
+ $project{"WXGTK_COMMONOBJS"} .= $file . " ";
+ $project{"WXGTK_COMMONDEPS"} .= $file2 . " "
}
foreach $file (sort keys %wxCommon) {
next if $wxCommon{$file} =~ /\bX\b/;
+ $file2 = $file;
$file =~ s/cp?p?$/\o/;
- $project{"WXMOTIF_COMMONOBJS"} .= "src/common/" . $file . " "
+ $file2 =~ s/cp?p?$/\d/;
+ $project{"WXMOTIF_COMMONOBJS"} .= $file . " ";
+ $project{"WXMOTIF_COMMONDEPS"} .= $file2 . " "
}
foreach $file (sort keys %wxCommon) {
@@ -61,8 +76,11 @@
#! needs extra files (sql*.h) so not compiled by default.
next if $file =~ /^odbc\./;
+ $file2 = $file;
$file =~ s/cp?p?$/\o/;
- $project{"WXMSW_COMMONOBJS"} .= "src/common/" . $file . " "
+ $file2 =~ s/cp?p?$/\d/;
+ $project{"WXMSW_COMMONOBJS"} .= $file . " ";
+ $project{"WXMSW_COMMONDEPS"} .= $file2 . " "
}
#! GUI
@@ -75,30 +93,45 @@
#! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
next if $file =~ /^dirdlg\./;
+ $file2 = $file;
$file =~ s/cp?p?$/\o/;
- $project{"WXMSW_GUIOBJS"} .= "src/msw/" . $file . " "
+ $file2 =~ s/cp?p?$/\d/;
+ $project{"WXMSW_GUIOBJS"} .= $file . " ";
+ $project{"WXMSW_GUIDEPS"} .= $file2 . " "
}
foreach $file (sort keys %wxGTK) {
+ $file2 = $file;
$file =~ s/cp?p?$/\o/;
- $project{"WXGTK_GUIOBJS"} .= "src/gtk/" . $file . " "
+ $file2 =~ s/cp?p?$/\d/;
+ $project{"WXGTK_GUIOBJS"} .= $file . " ";
+ $project{"WXGTK_GUIDEPS"} .= $file2 . " "
}
foreach $file (sort keys %wxMOTIF) {
+ $file2 = $file;
$file =~ s/cp?p?$/\o/;
- $project{"WXMOTIF_GUIOBJS"} .= "src/motif/" . $file . " "
+ $file2 =~ s/cp?p?$/\d/;
+ $project{"WXMOTIF_GUIOBJS"} .= $file . " ";
+ $project{"WXMOTIF_GUIDEPS"} .= $file2 . " "
}
#! others
foreach $file (sort keys %wxHTML) {
+ $file2 = $file;
$file =~ s/cp?p?$/\o/;
- $project{"WXHTMLOBJS"} .= "src/html/" . $file . " "
+ $file2 =~ s/cp?p?$/\d/;
+ $project{"WXHTMLOBJS"} .= $file . " ";
+ $project{"WXHTMLDEPS"} .= $file2 . " "
}
foreach $file (sort keys %wxUNIX) {
+ $file2 = $file;
$file =~ s/cp?p?$/\o/;
- $project{"WXUNIXOBJS"} .= "src/unix/" . $file . " "
+ $file2 =~ s/cp?p?$/\d/;
+ $project{"WXUNIXOBJS"} .= $file . " ";
+ $project{"WXUNIXDEPS"} .= $file2 . " "
}
#! headers
@@ -160,19 +193,29 @@ include ./src/make.env
.SUFFIXES: .o .cpp .c .cxx
.c.o :
- $(CCC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
+ $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $<
.cpp.o :
- $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+ $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
.cxx.o :
- $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+ $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
########################### Paths #################################
srcdir = @srcdir@
-VPATH = :@top_srcdir@
+VP1 = @top_srcdir@/src/common
+VP2 = @top_srcdir@/src/@TOOLKIT_DIR@
+VP3 = @top_srcdir@/src/motif/xmcombo
+VP4 = @top_srcdir@/src/generic
+VP5 = @top_srcdir@/src/unix
+VP6 = @top_srcdir@/src/html
+VP7 = @top_srcdir@/src/png
+VP8 = @top_srcdir@/src/jpeg
+VP9 = @top_srcdir@/src/zlib
+
+VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9)
top_srcdir = @top_srcdir@
prefix = @prefix@
@@ -202,7 +245,10 @@ top_builddir = .
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+# my autoconf doesn't set this
+#INSTALL_SCRIPT = @INSTALL_SCRIPT@
+# maybe do an additional chmod if needed?
+INSTALL_SCRIPT = @INSTALL@
transform = @program_transform_name@
NORMAL_INSTALL = :
@@ -237,12 +283,14 @@ MOTIFDIR = $(WXDIR)/src/motif
MSWDIR = $(WXDIR)/src/msw
INCDIR = $(WXDIR)/include
SAMPDIR = $(WXDIR)/samples
+UTILSDIR = $(WXDIR)/utils
+MISCDIR = $(WXDIR)/misc
DOCDIR = $(WXDIR)/docs
########################## Archive name ###############################
-WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)-b9.tgz
DISTDIR = ./_dist_dir/wx$(TOOLKIT)
############################## Files ##################################
@@ -274,168 +322,191 @@ HTML_HEADERS = \
GTK_GENERICOBJS = \
#$ ExpandList("WXGTK_GENERICOBJS");
+GTK_GENERICDEPS = \
+ #$ ExpandList("WXGTK_GENERICDEPS");
+
GTK_COMMONOBJS = \
parser.o \
#$ ExpandList("WXGTK_COMMONOBJS");
+GTK_COMMONDEPS = \
+ parser.d \
+ #$ ExpandList("WXGTK_COMMONDEPS");
+
GTK_GUIOBJS = \
#$ ExpandList("WXGTK_GUIOBJS");
+GTK_GUIDEPS = \
+ #$ ExpandList("WXGTK_GUIDEPS");
+
MOTIF_GENERICOBJS = \
#$ ExpandList("WXMOTIF_GENERICOBJS");
+MOTIF_GENERICDEPS = \
+ #$ ExpandList("WXMOTIF_GENERICDEPS");
+
MOTIF_COMMONOBJS = \
parser.o \
#$ ExpandList("WXMOTIF_COMMONOBJS");
+MOTIF_COMMONDEPS = \
+ parser.d \
+ #$ ExpandList("WXMOTIF_COMMONDEPS");
+
MOTIF_GUIOBJS = \
- src/motif/xmcombo/xmcombo.o \
+ xmcombo.o \
#$ ExpandList("WXMOTIF_GUIOBJS");
+MOTIF_GUIDEPS = \
+ xmcombo.d \
+ #$ ExpandList("WXMOTIF_GUIDEPS");
+
MSW_GENERICOBJS = \
#$ ExpandList("WXMSW_GENERICOBJS");
+MSW_GENERICDEPS = \
+ #$ ExpandList("WXMSW_GENERICDEPS");
+
MSW_COMMONOBJS = \
+ parser.o \
#$ ExpandList("WXMSW_COMMONOBJS");
+MSW_COMMONDEPS = \
+ parser.d \
+ #$ ExpandList("WXMSW_COMMONDEPS");
+
MSW_GUIOBJS = \
#$ ExpandList("WXMSW_GUIOBJS");
+MSW_GUIDEPS = \
+ #$ ExpandList("WXMSW_GUIDEPS");
+
HTMLOBJS = \
#$ ExpandList("WXHTMLOBJS");
+HTMLDEPS = \
+ #$ ExpandList("WXHTMLDEPS");
+
UNIXOBJS = \
#$ ExpandList("WXUNIXOBJS");
+UNIXDEPS = \
+ #$ ExpandList("WXUNIXDEPS");
+
ZLIBOBJS = \
- src/zlib/adler32.o \
- src/zlib/compress.o \
- src/zlib/crc32.o \
- src/zlib/gzio.o \
- src/zlib/uncompr.o \
- src/zlib/deflate.o \
- src/zlib/trees.o \
- src/zlib/zutil.o \
- src/zlib/inflate.o \
- src/zlib/infblock.o \
- src/zlib/inftrees.o \
- src/zlib/infcodes.o \
- src/zlib/infutil.o \
- src/zlib/inffast.o
+ adler32.o \
+ compress.o \
+ crc32.o \
+ gzio.o \
+ uncompr.o \
+ deflate.o \
+ trees.o \
+ zutil.o \
+ inflate.o \
+ infblock.o \
+ inftrees.o \
+ infcodes.o \
+ infutil.o \
+ inffast.o
PNGOBJS = \
- src/png/png.o \
- src/png/pngread.o \
- src/png/pngrtran.o \
- src/png/pngrutil.o \
- src/png/pngpread.o \
- src/png/pngtrans.o \
- src/png/pngwrite.o \
- src/png/pngwtran.o \
- src/png/pngwutil.o \
- src/png/pngerror.o \
- src/png/pngmem.o \
- src/png/pngwio.o \
- src/png/pngrio.o \
- src/png/pngget.o \
- src/png/pngset.o
+ png.o \
+ pngread.o \
+ pngrtran.o \
+ pngrutil.o \
+ pngpread.o \
+ pngtrans.o \
+ pngwrite.o \
+ pngwtran.o \
+ pngwutil.o \
+ pngerror.o \
+ pngmem.o \
+ pngwio.o \
+ pngrio.o \
+ pngget.o \
+ pngset.o
JPEGOBJS = \
- src/jpeg/jcomapi.o \
- src/jpeg/jutils.o \
- src/jpeg/jerror.o \
- src/jpeg/jmemmgr.o \
- src/jpeg/jmemnobs.o \
- src/jpeg/jcapimin.o \
- src/jpeg/jcapistd.o \
- src/jpeg/jctrans.o \
- src/jpeg/jcparam.o \
- src/jpeg/jdatadst.o \
- src/jpeg/jcinit.o \
- src/jpeg/jcmaster.o \
- src/jpeg/jcmarker.o \
- src/jpeg/jcmainct.o \
- src/jpeg/jcprepct.o \
- src/jpeg/jccoefct.o \
- src/jpeg/jccolor.o \
- src/jpeg/jcsample.o \
- src/jpeg/jchuff.o \
- src/jpeg/jcphuff.o \
- src/jpeg/jcdctmgr.o \
- src/jpeg/jfdctfst.o \
- src/jpeg/jfdctflt.o \
- src/jpeg/jfdctint.o \
- src/jpeg/jdapimin.o \
- src/jpeg/jdapistd.o \
- src/jpeg/jdtrans.o \
- src/jpeg/jdatasrc.o \
- src/jpeg/jdmaster.o \
- src/jpeg/jdinput.o \
- src/jpeg/jdmarker.o \
- src/jpeg/jdhuff.o \
- src/jpeg/jdphuff.o \
- src/jpeg/jdmainct.o \
- src/jpeg/jdcoefct.o \
- src/jpeg/jdpostct.o \
- src/jpeg/jddctmgr.o \
- src/jpeg/jidctfst.o \
- src/jpeg/jidctflt.o \
- src/jpeg/jidctint.o \
- src/jpeg/jidctred.o \
- src/jpeg/jdsample.o \
- src/jpeg/jdcolor.o \
- src/jpeg/jquant1.o \
- src/jpeg/jquant2.o \
- src/jpeg/jdmerge.o
+ jcomapi.o \
+ jutils.o \
+ jerror.o \
+ jmemmgr.o \
+ jmemnobs.o \
+ jcapimin.o \
+ jcapistd.o \
+ jctrans.o \
+ jcparam.o \
+ jdatadst.o \
+ jcinit.o \
+ jcmaster.o \
+ jcmarker.o \
+ jcmainct.o \
+ jcprepct.o \
+ jccoefct.o \
+ jccolor.o \
+ jcsample.o \
+ jchuff.o \
+ jcphuff.o \
+ jcdctmgr.o \
+ jfdctfst.o \
+ jfdctflt.o \
+ jfdctint.o \
+ jdapimin.o \
+ jdapistd.o \
+ jdtrans.o \
+ jdatasrc.o \
+ jdmaster.o \
+ jdinput.o \
+ jdmarker.o \
+ jdhuff.o \
+ jdphuff.o \
+ jdmainct.o \
+ jdcoefct.o \
+ jdpostct.o \
+ jddctmgr.o \
+ jidctfst.o \
+ jidctflt.o \
+ jidctint.o \
+ jidctred.o \
+ jdsample.o \
+ jdcolor.o \
+ jquant1.o \
+ jquant2.o \
+ jdmerge.o
OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(@UNIXOBJS@) $(HTMLOBJS) \
$(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)
+DEPFILES = $(@GUIDEPS@) $(@COMMONDEPS@) $(@GENERICDEPS@) $(UNIXDEPS) $(HTMLDEPS)
+
HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \
$(GENERIC_HEADERS) $(WX_HEADERS)
-REQUIRED_DIRS = ./lib ./src ./src/common ./src/gtk ./src/motif ./src/msw \
- ./src/generic ./src/unix ./src/motif/xmombo ./src/html \
- ./src/zlib ./src/jpeg ./src/png
-
-all: $(REQUIRED_DIRS) $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
-
-$(REQUIRED_DIRS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
- @mkdir -p ./lib
- @mkdir -p ./src
- @mkdir -p ./src/common
- @mkdir -p ./src/msw
- @mkdir -p ./src/gtk
- @mkdir -p ./src/motif
- @mkdir -p ./src/motif/xmcombo
- @mkdir -p ./src/generic
- @mkdir -p ./src/unix
- @mkdir -p ./src/html
- @mkdir -p ./src/png
- @mkdir -p ./src/jpeg
- @mkdir -p ./src/zlib
+all: $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
@WX_LIBRARY_NAME_STATIC@: $(OBJECTS)
+ @$(INSTALL) -d ./lib
$(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
$(RANLIB) ./lib/$@
@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
+ @$(INSTALL) -d ./lib
$(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
CREATE_LINKS: ./lib/@WX_TARGET_LIBRARY@
- @if test -e ./lib/@WX_LIBRARY_LINK1@; then rm -f ./lib/@WX_LIBRARY_LINK1@; fi
- @if test -e ./lib/@WX_LIBRARY_LINK2@; then rm -f ./lib/@WX_LIBRARY_LINK2@; fi
- @if test -e ./lib/@WX_LIBRARY_LINK3@; then rm -f ./lib/@WX_LIBRARY_LINK3@; fi
+ @$(RM) ./lib/@WX_LIBRARY_LINK1@
+ @$(RM) ./lib/@WX_LIBRARY_LINK2@
+ @$(RM) ./lib/@WX_LIBRARY_LINK3@
$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@
$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
CREATE_INSTALLED_LINKS: $(libdir)/@WX_TARGET_LIBRARY@
- @if test -e $(libdir)/@WX_LIBRARY_LINK1@; then rm -f $(libdir)/@WX_LIBRARY_LINK1@; fi
- @if test -e $(libdir)/@WX_LIBRARY_LINK2@; then rm -f $(libdir)/@WX_LIBRARY_LINK2@; fi
- @if test -e $(libdir)/@WX_LIBRARY_LINK3@; then rm -f $(libdir)/@WX_LIBRARY_LINK3@; fi
+ $(RM) $(libdir)/@WX_LIBRARY_LINK1@
+ $(RM) $(libdir)/@WX_LIBRARY_LINK2@
+ $(RM) $(libdir)/@WX_LIBRARY_LINK3@
$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@
$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@
$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@
@@ -443,7 +514,7 @@ CREATE_INSTALLED_LINKS: $(libdir)/@WX_TARGET_LIBRARY@
$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
parser.o: parser.c lexer.c
- $(CCLEX) -c $(CFLAGS) -o $@ parser.c
+ $(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c
parser.c: $(COMMDIR)/parser.y lexer.c
$(YACC) $(COMMDIR)/parser.y
@@ -463,28 +534,41 @@ lexer.c: $(COMMDIR)/lexer.l
sed -e "s/unput/PROIO_unput/g" > lexer.c
@$(RM) lex.yy.c
+-include $(DEPFILES)
+
preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h
@echo " "
@echo " Installing wxWindows..."
@echo " "
+ $(INSTALL) -d $(prefix)
+ $(INSTALL) -d $(bindir)
+ $(INSTALL) -d $(libdir)
+ $(INSTALL) -d $(datadir)
+
$(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
-
- @mkdir -p $(libdir)/wx
- @mkdir -p $(libdir)/wx/include
- @mkdir -p $(libdir)/wx/include/wx
- @mkdir -p $(libdir)/wx/include/wx/@TOOLKIT_DIR@
+
+ $(INSTALL) -d $(libdir)/wx
+ $(INSTALL) -d $(libdir)/wx/include
+ $(INSTALL) -d $(libdir)/wx/include/wx
+ $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
$(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
- @mkdir -p $(includedir)/wx
- @mkdir -p $(includedir)/wx/msw
- @mkdir -p $(includedir)/wx/gtk
- @mkdir -p $(includedir)/wx/motif
- @mkdir -p $(includedir)/wx/html
- @mkdir -p $(includedir)/wx/protocol
- @mkdir -p $(includedir)/wx/unix
- @mkdir -p $(includedir)/wx/generic
+ $(INSTALL) -d $(datadir)/wx
+ $(INSTALL) -d $(datadir)/wx/afm
+ $(INSTALL) -d $(datadir)/wx/gs_afm
+ $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
+ $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
+
+ $(INSTALL) -d $(includedir)/wx
+ $(INSTALL) -d $(includedir)/wx/msw
+ $(INSTALL) -d $(includedir)/wx/gtk
+ $(INSTALL) -d $(includedir)/wx/motif
+ $(INSTALL) -d $(includedir)/wx/html
+ $(INSTALL) -d $(includedir)/wx/protocol
+ $(INSTALL) -d $(includedir)/wx/unix
+ $(INSTALL) -d $(includedir)/wx/generic
@list='$(HEADERS)'; for p in $$list; do \
$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
@@ -509,16 +593,21 @@ uninstall:
@echo " Uninstalling wxWindows..."
@echo " "
@echo " Removing library..."
- @rm -f $(libdir)/@WX_TARGET_LIBRARY@
- @rm -f $(libdir)/@WX_LIBRARY_LINK1@
- @rm -f $(libdir)/@WX_LIBRARY_LINK2@
- @rm -f $(libdir)/@WX_LIBRARY_LINK3@
+ @$(RM) $(libdir)/@WX_TARGET_LIBRARY@
+ @$(RM) $(libdir)/@WX_LIBRARY_LINK1@
+ @$(RM) $(libdir)/@WX_LIBRARY_LINK2@
+ @$(RM) $(libdir)/@WX_LIBRARY_LINK3@
@echo " Removing helper files..."
- @rm -f $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
- @rm -f $(bindir)/wx-config
+ @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
+ @$(RM) $(bindir)/wx-config
+ @$(RM) $(datadir)/wx/afm/*
+ @$(RM) $(datadir)/wx/gs_afm/*
+ @rmdir $(datadir)/wx/gs_afm
+ @rmdir $(datadir)/wx/afm
+ @rmdir $(datadir)/wx
@echo " Removing headers..."
@list='$(HEADERS)'; for p in $$list; do \
- rm -f $(includedir)/wx/$$p; \
+ $(RM) $(includedir)/wx/$$p; \
done
@echo " Removing directories..."
@if test -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi
@@ -527,7 +616,7 @@ uninstall:
@if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi
@if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi
@if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/motif; fi
- @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/msw; fi
+ @if test -d $(includedir)/wx/msw; then rmdir $(includedir)/wx/msw; fi
@if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi
@if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi
@if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi
@@ -658,31 +747,210 @@ SAMPLES_DIST:
cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
- mkdir $(DISTDIR)/samples/checkls
+ mkdir $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/Makefile.in $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
-
-dist: ALL_DIST @GUIDIST@ SAMPLES_DIST
+ mkdir $(DISTDIR)/samples/dialogs
+ cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
+ cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
+ cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
+ cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
+ mkdir $(DISTDIR)/samples/dnd
+ cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
+ cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd
+ cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd
+ cp $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd
+ cp $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd
+ mkdir $(DISTDIR)/samples/docview
+ cp $(SAMPDIR)/docview/Makefile.in $(DISTDIR)/samples/docview
+ cp $(SAMPDIR)/docview/*.cpp $(DISTDIR)/samples/docview
+ cp $(SAMPDIR)/docview/*.h $(DISTDIR)/samples/docview
+ cp $(SAMPDIR)/docview/*.xpm $(DISTDIR)/samples/docview
+ mkdir $(DISTDIR)/samples/docvwmdi
+ cp $(SAMPDIR)/docvwmdi/Makefile.in $(DISTDIR)/samples/docvwmdi
+ cp $(SAMPDIR)/docvwmdi/*.cpp $(DISTDIR)/samples/docvwmdi
+ cp $(SAMPDIR)/docvwmdi/*.h $(DISTDIR)/samples/docvwmdi
+ mkdir $(DISTDIR)/samples/drawing
+ cp $(SAMPDIR)/drawing/Makefile.in $(DISTDIR)/samples/drawing
+ cp $(SAMPDIR)/drawing/*.cpp $(DISTDIR)/samples/drawing
+ cp $(SAMPDIR)/drawing/*.xpm $(DISTDIR)/samples/drawing
+ mkdir $(DISTDIR)/samples/dynamic
+ cp $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic
+ cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
+ cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
+ mkdir $(DISTDIR)/samples/html
+ cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html
+ mkdir $(DISTDIR)/samples/html/about
+ cp $(SAMPDIR)/html/about/Makefile.in $(DISTDIR)/samples/html/about
+ cp $(SAMPDIR)/html/about/*.cpp $(DISTDIR)/samples/html/about
+ mkdir $(DISTDIR)/samples/html/about/data
+ cp $(SAMPDIR)/html/about/data/*.htm $(DISTDIR)/samples/html/about/data
+ cp $(SAMPDIR)/html/about/data/*.png $(DISTDIR)/samples/html/about/data
+ mkdir $(DISTDIR)/samples/html/help
+ cp $(SAMPDIR)/html/help/Makefile.in $(DISTDIR)/samples/html/help
+ cp $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help
+ mkdir $(DISTDIR)/samples/html/help/helpfiles
+ cp $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles
+ mkdir $(DISTDIR)/samples/html/printing
+ cp $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing
+ cp $(SAMPDIR)/html/printing/*.xpm $(DISTDIR)/samples/html/printing
+ cp $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing
+ cp $(SAMPDIR)/html/printing/*.h $(DISTDIR)/samples/html/printing
+ cp $(SAMPDIR)/html/printing/*.png $(DISTDIR)/samples/html/printing
+ cp $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing
+ mkdir $(DISTDIR)/samples/html/test
+ cp $(SAMPDIR)/html/test/Makefile.in $(DISTDIR)/samples/html/test
+ cp $(SAMPDIR)/html/test/*.cpp $(DISTDIR)/samples/html/test
+ cp $(SAMPDIR)/html/test/*.bmp $(DISTDIR)/samples/html/test
+ cp $(SAMPDIR)/html/test/*.png $(DISTDIR)/samples/html/test
+ cp $(SAMPDIR)/html/test/*.htm $(DISTDIR)/samples/html/test
+ cp $(SAMPDIR)/html/test/*.html $(DISTDIR)/samples/html/test
+ mkdir $(DISTDIR)/samples/html/virtual
+ cp $(SAMPDIR)/html/virtual/Makefile.in $(DISTDIR)/samples/html/virtual
+ cp $(SAMPDIR)/html/virtual/*.cpp $(DISTDIR)/samples/html/virtual
+ cp $(SAMPDIR)/html/virtual/*.htm $(DISTDIR)/samples/html/virtual
+ mkdir $(DISTDIR)/samples/html/widget
+ cp $(SAMPDIR)/html/widget/Makefile.in $(DISTDIR)/samples/html/widget
+ cp $(SAMPDIR)/html/widget/*.cpp $(DISTDIR)/samples/html/widget
+ cp $(SAMPDIR)/html/widget/*.htm $(DISTDIR)/samples/html/widget
+ mkdir $(DISTDIR)/samples/html/zip
+ cp $(SAMPDIR)/html/zip/Makefile.in $(DISTDIR)/samples/html/zip
+ cp $(SAMPDIR)/html/zip/*.cpp $(DISTDIR)/samples/html/zip
+ cp $(SAMPDIR)/html/zip/*.htm $(DISTDIR)/samples/html/zip
+ cp $(SAMPDIR)/html/zip/*.zip $(DISTDIR)/samples/html/zip
+ mkdir $(DISTDIR)/samples/image
+ cp $(SAMPDIR)/image/Makefile.in $(DISTDIR)/samples/image
+ cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image
+ cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
+ mkdir $(DISTDIR)/samples/layout
+ cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
+ cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout
+ cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout
+ mkdir $(DISTDIR)/samples/listctrl
+ cp $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl
+ cp $(SAMPDIR)/listctrl/*.cpp $(DISTDIR)/samples/listctrl
+ cp $(SAMPDIR)/listctrl/*.h $(DISTDIR)/samples/listctrl
+ cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl
+ mkdir $(DISTDIR)/samples/listctrl/bitmap
+ cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
+ mkdir $(DISTDIR)/samples/mdi
+ cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi
+ cp $(SAMPDIR)/mdi/*.cpp $(DISTDIR)/samples/mdi
+ cp $(SAMPDIR)/mdi/*.h $(DISTDIR)/samples/mdi
+ cp $(SAMPDIR)/mdi/*.xpm $(DISTDIR)/samples/mdi
+ mkdir $(DISTDIR)/samples/minifram
+ cp $(SAMPDIR)/minifram/Makefile.in $(DISTDIR)/samples/minifram
+ cp $(SAMPDIR)/minifram/*.cpp $(DISTDIR)/samples/minifram
+ cp $(SAMPDIR)/minifram/*.h $(DISTDIR)/samples/minifram
+ cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram
+ mkdir $(DISTDIR)/samples/minifram/bitmap
+ cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram/bitmaps
+ mkdir $(DISTDIR)/samples/minimal
+ cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
+ cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
+ cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
+ mkdir $(DISTDIR)/samples/notebook
+ cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
+ cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook
+ cp $(SAMPDIR)/notebook/*.h $(DISTDIR)/samples/notebook
+ mkdir $(DISTDIR)/samples/proplist
+ cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
+ cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist
+ cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist
+ mkdir $(DISTDIR)/samples/sashtest
+ cp $(SAMPDIR)/sashtest/Makefile.in $(DISTDIR)/samples/sashtest
+ cp $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest
+ cp $(SAMPDIR)/sashtest/*.h $(DISTDIR)/samples/sashtest
+ mkdir $(DISTDIR)/samples/scroll
+ cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
+ cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll
+ mkdir $(DISTDIR)/samples/splitter
+ cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
+ cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
+ mkdir $(DISTDIR)/samples/text
+ cp $(SAMPDIR)/text/Makefile.in $(DISTDIR)/samples/text
+ cp $(SAMPDIR)/text/*.cpp $(DISTDIR)/samples/text
+ cp $(SAMPDIR)/text/*.xpm $(DISTDIR)/samples/text
+ mkdir $(DISTDIR)/samples/thread
+ cp $(SAMPDIR)/thread/Makefile.in $(DISTDIR)/samples/thread
+ cp $(SAMPDIR)/thread/*.cpp $(DISTDIR)/samples/thread
+ mkdir $(DISTDIR)/samples/toolbar
+ cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar
+ cp $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar
+ cp $(SAMPDIR)/toolbar/*.h $(DISTDIR)/samples/toolbar
+ cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
+ mkdir $(DISTDIR)/samples/toolbar/bitmap
+ cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
+ mkdir $(DISTDIR)/samples/treectrl
+ cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
+ cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl
+ cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl
+ cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
+ mkdir $(DISTDIR)/samples/typetest
+ cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest
+ cp $(SAMPDIR)/typetest/*.cpp $(DISTDIR)/samples/typetest
+ cp $(SAMPDIR)/typetest/*.h $(DISTDIR)/samples/typetest
+ cp $(SAMPDIR)/typetest/*.xpm $(DISTDIR)/samples/typetest
+ mkdir $(DISTDIR)/samples/validate
+ cp $(SAMPDIR)/validate/Makefile.in $(DISTDIR)/samples/validate
+ cp $(SAMPDIR)/validate/*.cpp $(DISTDIR)/samples/validate
+ cp $(SAMPDIR)/validate/*.h $(DISTDIR)/samples/validate
+ cp $(SAMPDIR)/validate/*.xpm $(DISTDIR)/samples/validate
+ mkdir $(DISTDIR)/samples/wizard
+ cp $(SAMPDIR)/wizard/Makefile.in $(DISTDIR)/samples/wizard
+ cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard
+ cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard
+ mkdir $(DISTDIR)/samples/wxpoem
+ cp $(SAMPDIR)/wxpoem/Makefile.in $(DISTDIR)/samples/wxpoem
+ cp $(SAMPDIR)/wxpoem/*.cpp $(DISTDIR)/samples/wxpoem
+ cp $(SAMPDIR)/wxpoem/*.xpm $(DISTDIR)/samples/wxpoem
+ cp $(SAMPDIR)/wxpoem/*.dat $(DISTDIR)/samples/wxpoem
+ cp $(SAMPDIR)/wxpoem/*.txt $(DISTDIR)/samples/wxpoem
+ mkdir $(DISTDIR)/samples/wxsocket
+ cp $(SAMPDIR)/wxsocket/Makefile.in $(DISTDIR)/samples/wxsocket
+ cp $(SAMPDIR)/wxsocket/*.cpp $(DISTDIR)/samples/wxsocket
+ cp $(SAMPDIR)/wxsocket/*.xpm $(DISTDIR)/samples/wxsocket
+
+UTILS_DIST:
+ mkdir $(DISTDIR)/utils
+ cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
+ mkdir $(DISTDIR)/utils/wxMMedia2
+ cp $(UTILSDIR)/wxMMedia2/Makefile.in $(DISTDIR)/utils/wxMMedia2
+ mkdir $(DISTDIR)/utils/wxMMedia2/lib
+ cp $(UTILSDIR)/wxMMedia2/lib/Makefile.in $(DISTDIR)/utils/wxMMedia2/lib
+ cp $(UTILSDIR)/wxMMedia2/lib/*.h $(DISTDIR)/utils/wxMMedia2/lib
+ cp $(UTILSDIR)/wxMMedia2/lib/*.cpp $(DISTDIR)/utils/wxMMedia2/lib
+ cp $(UTILSDIR)/wxMMedia2/lib/*.def $(DISTDIR)/utils/wxMMedia2/lib
+ mkdir $(DISTDIR)/utils/wxMMedia2/sample
+ cp $(UTILSDIR)/wxMMedia2/sample/Makefile.in $(DISTDIR)/utils/wxMMedia2/sample
+ cp $(UTILSDIR)/wxMMedia2/sample/*.cpp $(DISTDIR)/utils/wxMMedia2/sample
+ mkdir $(DISTDIR)/utils/glcanvas
+ cp $(UTILSDIR)/glcanvas/Makefile.in $(DISTDIR)/utils/glcanvas
+ cp $(UTILSDIR)/glcanvas/docs/notes.txt $(DISTDIR)/utils/glcanvas/NOTES.txt
+ mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
+ cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/Makefile.in $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
+ cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.h $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
+ cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.cpp $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
+
+MISC_DIST:
+ mkdir $(DISTDIR)/misc
+ mkdir $(DISTDIR)/misc/afm
+ cp $(MISCDIR)/afm/*.afm $(DISTDIR)/misc/afm
+ mkdir $(DISTDIR)/misc/gs_afm
+ cp $(MISCDIR)/gs_afm/*.afm $(DISTDIR)/misc/gs_afm
+
+dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
- rm -f -r _dist_dir
+ $(RM) -r _dist_dir
clean:
- rm -f ./src/msw/*.o
- rm -f ./src/gtk/*.o
- rm -f ./src/motif/*.o
- rm -f ./src/html/*.o
- rm -f ./src/common/*.o
- rm -f ./src/unix/*.o
- rm -f ./src/generic/*.o
- rm -f ./src/png/*.o
- rm -f ./src/jpeg/*.o
- rm -f ./src/zlib/*.o
- rm -f *.o
- rm -f parser.c
- rm -f lexer.c
- rm -f ./lib/*
+ $(RM) *.o
+ $(RM) *.d
+ $(RM) parser.c
+ $(RM) lexer.c
+ $(RM) ./lib/*
cleanall: clean