X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d6e969f6773f0d13db130921cede8b3068ac09e3..367c84b903487509202a6d8d9e847892bcf1b832:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 0a37c5509d..4a35dd171f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,45 +30,27 @@ include ./src/make.env
 ########################### Paths #################################
 
 srcdir = @srcdir@
+top_srcdir = @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/tiff
-VP10 = @top_srcdir@/src/zlib
-VP11 = @top_srcdir@/src/iodbc
-VP12 = @top_srcdir@/src/msw/ole
-
-FTVP01 = @top_srcdir@/src/freetype/unix
-FTVP02 = @top_srcdir@/src/freetype/autohint
-FTVP03 = @top_srcdir@/src/freetype/base
-FTVP04 = @top_srcdir@/src/freetype/cff
-FTVP05 = @top_srcdir@/src/freetype/cid
-FTVP06 = @top_srcdir@/src/freetype/macfond
-FTVP07 = @top_srcdir@/src/freetype/otlayout
-FTVP08 = @top_srcdir@/src/freetype/psnames
-FTVP09 = @top_srcdir@/src/freetype/raster1
-FTVP10 = @top_srcdir@/src/freetype/sfnt
-FTVP11 = @top_srcdir@/src/freetype/smooth
-FTVP12 = @top_srcdir@/src/freetype/truetype
-FTVP13 = @top_srcdir@/src/freetype/type1
-FTVP14 = @top_srcdir@/src/freetype/type1z
-FTVP15 = @top_srcdir@/src/freetype/winfonts
-
-VP13 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
-VP14 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@
+VP1 = @TOOLKIT_VPATH@
+VP2 = @top_srcdir@/src/common
+VP3 = @top_srcdir@/src/generic
+VP4 = @top_srcdir@/src/unix
+VP5 = @top_srcdir@/src/html
+VP6 = @top_srcdir@/src/png
+VP7 = @top_srcdir@/src/jpeg
+VP8 = @top_srcdir@/src/tiff
+VP9 = @top_srcdir@/src/zlib
+VP10 = @top_srcdir@/src/iodbc
+VP11 = @top_srcdir@/src/msw/ole
+VP12 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
+VP13 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@
 
 # the comment at the end of the next line is needed because otherwise autoconf
 # would remove this line completely - it contains a built-in hack to remove
 # any VPATH assignment not containing ':'
-VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13)@PATH_IFS@$(VP14) # ':' for autoconf
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13) # ':' for autoconf
 
-top_srcdir = @top_srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
@@ -154,17 +136,18 @@ INTLDIR  = $(WXDIR)/locale
 
 # append a version suffix x.y.z to all file names
 VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER)
-WXARCHIVE = @DISTDIR@-$(VER_SUFFIX).tar.gz
-WXGLARCHIVE = @DISTDIR@-gl-$(VER_SUFFIX).tar.gz
-WXSAMPLES = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
-WXDEMOS = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz
+WXARCHIVE=@DISTDIR@-$(VER_SUFFIX).tar.gz
+WXGLARCHIVE=@DISTDIR@-gl-$(VER_SUFFIX).tar.gz
+WXSAMPLES=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
+WXDEMOS=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz
 
-WXARCHIVE_BZIP = @DISTDIR@-$(VER_SUFFIX).tar.bz2
-WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
-WXSAMPLES_BZIP = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
-WXDEMOS_BZIP = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2
+WXARCHIVE_BZIP=@DISTDIR@-$(VER_SUFFIX).tar.bz2
+WXGLARCHIVE_BZIP=@DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
+WXSAMPLES_BZIP=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
+WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2
 
-DISTDIR = ./_dist_dir/@DISTDIR@
+DISTDIRNAME=@DISTDIR@-$(VER_SUFFIX)
+DISTDIR=./_dist_dir/$(DISTDIRNAME)
 
 
 ############################## Files ##################################
@@ -618,7 +601,7 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/src/tiff
 	mkdir $(DISTDIR)/src/iodbc
 	mkdir $(DISTDIR)/src/unix
-	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
+	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
 	cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
 	cp $(COMMDIR)/*.c $(DISTDIR)/src/common
@@ -658,7 +641,7 @@ BASE_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/src/common
 	mkdir $(DISTDIR)/src/unix
-	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
+	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)
 	cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
 	cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@
 	cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR)
@@ -872,6 +855,16 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
 	cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
 
+	mkdir $(DISTDIR)/samples/erase
+	cp $(SAMPDIR)/erase/Makefile.in $(DISTDIR)/samples/erase
+	cp $(SAMPDIR)/erase/makefile.unx $(DISTDIR)/samples/erase
+	cp $(SAMPDIR)/erase/*.cpp $(DISTDIR)/samples/erase
+
+	mkdir $(DISTDIR)/samples/event
+	cp $(SAMPDIR)/event/Makefile.in $(DISTDIR)/samples/event
+	cp $(SAMPDIR)/event/makefile.unx $(DISTDIR)/samples/event
+	cp $(SAMPDIR)/event/*.cpp $(DISTDIR)/samples/event
+
 	mkdir $(DISTDIR)/samples/exec
 	cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
 	cp $(SAMPDIR)/exec/makefile.unx $(DISTDIR)/samples/exec
@@ -1300,10 +1293,7 @@ distclean:
 #     the files twice
 dist-only:
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	@cd _dist_dir; \
-	mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
-	tar ch @DISTDIR@-$(VER_SUFFIX) | gzip -f9 > ../$(WXARCHIVE); \
-	mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
+	@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
 	mv samples wxSamples-$(VER_SUFFIX); \
@@ -1317,12 +1307,9 @@ dist-only:
 	fi
 
 dist: @GUIDIST@
-	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
+	cp $(WXDIR)/src/files.lst $(DISTDIR)/src
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	@cd _dist_dir; \
-	mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
-	tar ch @DISTDIR@-$(VER_SUFFIX) | gzip -f9 > ../$(WXARCHIVE); \
-	mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
+	@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
 	mv samples wxSamples-$(VER_SUFFIX); \
@@ -1337,7 +1324,7 @@ dist: @GUIDIST@
 
 bzip-dist-only:
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	@cd _dist_dir; tar ch @DISTDIR@ | bzip2 -f9 > $(WXARCHIVE_BZIP); mv $(WXARCHIVE_BZIP) ..
+	@cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP);
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
 	mv samples wxSamples-${VER_SUFFIX}; \
@@ -1349,10 +1336,11 @@ bzip-dist-only:
 	tar ch wxDemos-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \
 	mv wxDemos-${VER_SUFFIX} demos; \
 	fi
+
 bzip-dist: @GUIDIST@
 	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	cd _dist_dir; tar ch @DISTDIR@ | bzip2 -f9 > $(WXARCHIVE_BZIP); mv $(WXARCHIVE_BZIP) ..
+	@cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP)
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
 	mv samples wxSamples; \