X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b51b78a9c7b50053cdcf4a22d2222500a20eb8ee..abceee76ea4d642ccfd3cf91cc139a3fe2b471b7:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 3049bb2aad..d9afb26eee 100644 --- a/Makefile.in +++ b/Makefile.in @@ -296,23 +296,25 @@ all: @WX_ALL@ @WX_LIBRARY_NAME_SHARED@: $(OBJECTS) @$(INSTALL) -d ./lib - $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS) + $(SHARED_LD) $(LDFLAGS) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS) CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@ @$(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@ + cd lib \ + && $(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_INSTALLED_LINKS: preinstall $(RM) $(libdir)/@WX_LIBRARY_LINK1@ $(RM) $(libdir)/@WX_LIBRARY_LINK2@ $(RM) $(libdir)/@WX_LIBRARY_LINK3@ - $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@ - $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@ - $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@ + cd $(libdir) \ + && $(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@ $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h @@ -349,7 +351,7 @@ afminstall: preinstall # this is the real install target: copies the library, wx-config and the # headers to the installation directory -preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config +preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_DIR@-config @echo " " @echo " Installing wxWindows..." @echo " " @@ -358,7 +360,8 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(INSTALL) -d $(bindir) $(INSTALL) -d $(libdir) - $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config + $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_DIR@-config $(bindir)/wx@TOOLKIT_DIR@-config + cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_DIR@-config wx-config $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ $(INSTALL) -d $(libdir)/wx @@ -403,11 +406,13 @@ uninstall: @echo " Removing helper files..." @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h @$(RM) $(bindir)/wx-config + @$(RM) $(bindir)/wx@TOOLKIT_DIR@-config @$(RM) $(datadir)/wx/afm/* @$(RM) $(datadir)/wx/gs_afm/* - @rmdir $(datadir)/wx/gs_afm - @rmdir $(datadir)/wx/afm - @rmdir $(datadir)/wx +# FIXME: wxBase doesnt install these next 3 dirs. + @-rmdir $(datadir)/wx/gs_afm + @-rmdir $(datadir)/wx/afm + @-rmdir $(datadir)/wx @echo " Removing headers..." @list='$(HEADERS)'; for p in $$list; do \ $(RM) $(includedir)/wx/$$p; \ @@ -598,11 +603,13 @@ DEMOS_DIST: ALL_GUI_DIST cp $(DEMODIR)/life/*.cpp $(DISTDIR)/demos/life cp $(DEMODIR)/life/*.h $(DISTDIR)/demos/life cp $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life + cp $(DEMODIR)/life/*.inc $(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 + cp $(DEMODIR)/poem/*.h $(DISTDIR)/demos/poem cp $(DEMODIR)/poem/*.cpp $(DISTDIR)/demos/poem cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem @@ -1041,6 +1048,40 @@ MANUAL_DIST: cp $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src cp $(UTILSDIR)/tex2rtf/src/tex2rtf.* $(DISTDIR)/utils/tex2rtf/src +# this target does not generate a complete wxPython dist, it only includes +# those files needed for the Debian source package. +# see utils/wxPython/distrib for scripts to make a proper wxPython dist. +PYTHON_DIST: + mkdir $(DISTDIR)/utils/wxPython + mkdir $(DISTDIR)/utils/wxPython/demo + mkdir $(DISTDIR)/utils/wxPython/demo/bitmaps + mkdir $(DISTDIR)/utils/wxPython/demo/data + mkdir $(DISTDIR)/utils/wxPython/distrib + mkdir $(DISTDIR)/utils/wxPython/lib + mkdir $(DISTDIR)/utils/wxPython/lib/editor + mkdir $(DISTDIR)/utils/wxPython/lib/sizers + mkdir $(DISTDIR)/utils/wxPython/modules + mkdir $(DISTDIR)/utils/wxPython/modules/html + mkdir $(DISTDIR)/utils/wxPython/modules/utils + mkdir $(DISTDIR)/utils/wxPython/modules/utils/gtk + mkdir $(DISTDIR)/utils/wxPython/src + mkdir $(DISTDIR)/utils/wxPython/src/gtk + + cp $(UTILSDIR)/wxPython/*.txt $(DISTDIR)/utils/wxPython + -cp $(UTILSDIR)/wxPython/demo/* $(DISTDIR)/utils/wxPython/demo + -cp $(UTILSDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/utils/wxPython/demo/bitmaps + -cp $(UTILSDIR)/wxPython/demo/data/* $(DISTDIR)/utils/wxPython/demo/data + cp $(UTILSDIR)/wxPython/distrib/build.py $(DISTDIR)/utils/wxPython/distrib + cp $(UTILSDIR)/wxPython/lib/*.py $(DISTDIR)/utils/wxPython/lib + cp $(UTILSDIR)/wxPython/lib/editor/*.py $(DISTDIR)/utils/wxPython/lib/editor + cp $(UTILSDIR)/wxPython/lib/sizers/*.py $(DISTDIR)/utils/wxPython/lib/sizers + -cp $(UTILSDIR)/wxPython/modules/html/* $(DISTDIR)/utils/wxPython/modules/html + -cp $(UTILSDIR)/wxPython/modules/utils/* $(DISTDIR)/utils/wxPython/modules/utils + cp $(UTILSDIR)/wxPython/modules/utils/gtk/utils.* $(DISTDIR)/utils/wxPython/modules/utils/gtk + -cp $(UTILSDIR)/wxPython/src/* $(DISTDIR)/utils/wxPython/src + cp $(UTILSDIR)/wxPython/src/gtk/*.py $(DISTDIR)/utils/wxPython/src/gtk + cp $(UTILSDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/utils/wxPython/src/gtk + distclean: $(RM) -r _dist_dir @@ -1057,14 +1098,16 @@ dist: @GUIDIST@ mv wxDemos demos; \ fi -debian-dist: GTK_DIST DEMOS_DIST UTILS_DIST MISC_DIST MANUAL_DIST +debian-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST mkdir $(DISTDIR)/debian -cp $(WXDIR)/debian/* $(DISTDIR)/debian + cp $(WXDIR)/src/files.lst $(DISTDIR)/src/ cp $(DOCDIR)/licence.txt $(DISTDIR)/docs cp $(DOCDIR)/licendoc.txt $(DISTDIR)/docs cp $(DOCDIR)/preamble.txt $(DISTDIR)/docs - rm -rf $(WXDIR)/../wxwindows-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER) - mv $(DISTDIR) $(WXDIR)/../wxwindows-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER) + rm -f $(DISTDIR)/*.spec + rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER) + mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER) clean: $(RM) *.o