]> git.saurik.com Git - wxWidgets.git/blobdiff - Makefile.in
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added wxADJUST_MINSIZE sizer flag
[wxWidgets.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in
index e67e519df5d880565aea150b55980fec7ccbcf27..4a1c44411f292a1262400d9db99bdf531580e98e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,6 +42,7 @@ VP8 = @top_srcdir@/src/jpeg
 VP9 = @top_srcdir@/src/tiff
 VP10 = @top_srcdir@/src/zlib
 VP11 = @top_srcdir@/src/iodbc
+VP12 = @top_srcdir@/src/ole
 
 FTVP01 = @top_srcdir@/src/freetype/unix
 FTVP02 = @top_srcdir@/src/freetype/autohint
@@ -59,13 +60,13 @@ FTVP13 = @top_srcdir@/src/freetype/type1
 FTVP14 = @top_srcdir@/src/freetype/type1z
 FTVP15 = @top_srcdir@/src/freetype/winfonts
 
-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@
+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@
 
 # 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) # ':' 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)@PATH_IFS@$(VP14) # ':' for autoconf
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -137,6 +138,7 @@ GTKDIR   = $(WXDIR)/src/gtk
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
 PMDIR    = $(WXDIR)/src/os2
+MACDIR   = $(WXDIR)/src/mac
 ODBCDIR  = $(WXDIR)/src/iodbc
 FTDIR    = $(WXDIR)/src/freetype
 INCDIR   = $(WXDIR)/include
@@ -150,15 +152,17 @@ INTLDIR  = $(WXDIR)/locale
 
 ########################## Archive name ###############################
 
-WXARCHIVE = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
-WXGLARCHIVE = @DISTDIR@-gl-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
-WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
-WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
+# append a version suffix x.y.z to all file names
+VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
+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@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
-WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
-WXSAMPLES_BZIP = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
-WXDEMOS_BZIP = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).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@
 
@@ -354,11 +358,11 @@ all: @WX_ALL@
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
        @$(INSTALL) -d ./lib
        $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
-       
+
 @WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o
        @$(INSTALL) -d ./lib
        $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
-       
+
 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
        @$(RM) ./lib/@WX_LIBRARY_LINK1@
        @$(RM) ./lib/@WX_LIBRARY_LINK2@
@@ -367,7 +371,7 @@ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
                && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
                && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
                && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
-       
+
 CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
        @$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
        @$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
@@ -376,7 +380,7 @@ CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
                && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
                && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
                && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
-       
+
 CREATE_INSTALLED_LINKS: preinstall
        $(RM) $(libdir)/@WX_LIBRARY_LINK1@
        $(RM) $(libdir)/@WX_LIBRARY_LINK2@
@@ -385,7 +389,7 @@ CREATE_INSTALLED_LINKS: preinstall
                && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
                && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
                && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
-       
+
 CREATE_INSTALLED_LINKS_GL: preinstall_gl
        $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
        $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
@@ -394,7 +398,7 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl
                && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
                && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
                && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
-       
+
 $(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
 
 parser.o:    parser.c lexer.c
@@ -448,7 +452,7 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_N
        $(INSTALL) -d $(libdir)/wx/include/wx
        $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@
        $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
-       
+
        $(INSTALL) -d $(includedir)/wx
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
@@ -688,6 +692,9 @@ MOTIF_DIST: ALL_GUI_DIST
        cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
        cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
 
+MACX_DIST: ALL_GUI_DIST
+       echo "Apple Mac OS X specific distribution not complete"
+
 MSW_DIST: ALL_GUI_DIST
        cp $(WXDIR)/wxWINE.spec $(DISTDIR)
        cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
@@ -706,9 +713,9 @@ DEMOS_DIST: ALL_GUI_DIST
        cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
        cp $(DEMODIR)/configure $(DISTDIR)/demos
        cp $(DEMODIR)/configure.in $(DISTDIR)/demos
-       
+
        cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
-           
+    
        mkdir $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
@@ -716,7 +723,7 @@ DEMOS_DIST: ALL_GUI_DIST
        cp $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
-       
+
        mkdir $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
@@ -724,7 +731,7 @@ DEMOS_DIST: ALL_GUI_DIST
        cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
-       
+
        mkdir $(DISTDIR)/demos/life
        mkdir $(DISTDIR)/demos/life/bitmaps
        cp $(DEMODIR)/life/Makefile.in $(DISTDIR)/demos/life
@@ -735,7 +742,7 @@ DEMOS_DIST: ALL_GUI_DIST
        cp $(DEMODIR)/life/*.inc $(DISTDIR)/demos/life
        cp $(DEMODIR)/life/*.lif $(DISTDIR)/demos/life
        cp $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps
-       
+
        mkdir $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/makefile.unx $(DISTDIR)/demos/poem
@@ -744,12 +751,12 @@ DEMOS_DIST: ALL_GUI_DIST
        cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem
-    
+
        mkdir $(DISTDIR)/demos/fractal
        cp $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal
        cp $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal
        cp $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal
-       
+
 SAMPLES_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/samples
        cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
@@ -1277,15 +1284,18 @@ distclean:
 dist: @GUIDIST@
        cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
        @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-       cd _dist_dir; tar ch @DISTDIR@ | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
+       @cd _dist_dir; \
+       mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
+       tar ch @DISTDIR@-$(VER_SUFFIX) | gzip -f9 > ../$(WXARCHIVE); \
+       mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
        @if test "$(USE_GUI)" = 1; then \
        cd $(DISTDIR); \
-       mv samples wxSamples; \
-       tar ch wxSamples | gzip -f9 > ../../$(WXSAMPLES); \
-       mv wxSamples samples; \
-       mv demos wxDemos; \
-       tar ch wxDemos | gzip -f9 > ../../$(WXDEMOS); \
-       mv wxDemos demos; \
+       mv samples wxSamples-$(VER_SUFFIX); \
+       tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
+       mv wxSamples-$(VER_SUFFIX) samples; \
+       mv demos wxDemos-$(VER_SUFFIX); \
+       tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
+       mv wxDemos-$(VER_SUFFIX) demos; \
        fi
 
 bzip-dist: @GUIDIST@
wxWidgets (Impactor)