X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b36d8c8f112a9a649d659573677c25a294ca8a3c..3f93aa54a900d873977d8bdfcc9cededaaa0bee8:/Makefile.in diff --git a/Makefile.in b/Makefile.in index acfa397aed..ddb8121778 100644 --- a/Makefile.in +++ b/Makefile.in @@ -114,6 +114,7 @@ INTLDIR = $(WXDIR)/locale ########################## Archive name ############################### # append a version suffix x.y.z to all file names +VER_MAJMIN=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER) 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 @@ -394,10 +395,15 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl afminstall: preinstall @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi $(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 $(datadir)/wx/$(VER_MAJMIN) + $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm + $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm + $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm + $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm + +m4datainstall: preinstall + $(INSTALL) -d $(datadir)/aclocal + $(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal # this is the real install target: copies the library, wx-config and the # headers to the installation directory @@ -412,7 +418,7 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config - $(INSTALL_PROGRAM) $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ + @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi @@ -457,9 +463,9 @@ preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@ @echo " Installing wxWindows OpenGl add-on..." @echo " " @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi - $(INSTALL_PROGRAM) $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@ + @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@ -install: @AFMINSTALL@ @WX_ALL_INSTALLED@ +install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @echo " " @echo " The installation of wxWindows is finished. On certain" @echo " platforms (e.g. Linux) you'll now have to run ldconfig" @@ -524,6 +530,7 @@ uninstall: ALL_DIST: distclean mkdir _dist_dir mkdir $(DISTDIR) + cp $(WXDIR)/wxwin.m4 $(DISTDIR) cp $(WXDIR)/aclocal.m4 $(DISTDIR) cp $(WXDIR)/configure.in $(DISTDIR) cp $(WXDIR)/configure $(DISTDIR) @@ -539,10 +546,13 @@ ALL_DIST: distclean cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt + cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt + cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt mkdir $(DISTDIR)/lib cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib mkdir $(DISTDIR)/src + cp $(SRCDIR)/files.lst $(DISTDIR)/src/ mkdir $(DISTDIR)/src/zlib cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib @@ -564,9 +574,10 @@ ALL_DIST: distclean # but is not used when building wxBase distribution ALL_GUI_DIST: ALL_DIST cp $(WXDIR)/wxBase.spec $(DISTDIR) - cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt - cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt - cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt + cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt + if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \ + cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi + cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt mkdir $(DISTDIR)/include mkdir $(DISTDIR)/include/wx @@ -593,7 +604,6 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/src/tiff mkdir $(DISTDIR)/src/iodbc mkdir $(DISTDIR)/src/unix - cp $(SRCDIR)/files.lst $(DISTDIR)/src/ cp $(SRCDIR)/*.in $(DISTDIR)/src cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common cp $(COMMDIR)/*.c $(DISTDIR)/src/common @@ -636,11 +646,11 @@ BASE_DIST: ALL_DIST mkdir $(DISTDIR)/include/wx/unix mkdir $(DISTDIR)/src/common mkdir $(DISTDIR)/src/unix + mkdir $(DISTDIR)/src/msw cp $(WXDIR)/wxBase.spec $(DISTDIR) cp @PORT_FILES@ $(DISTDIR) - cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@ - cp $(WXDIR)/wxBase*.dsp $(DISTDIR) - cp $(WXDIR)/wxBase*.dsw $(DISTDIR) + cp $(WXDIR)/src/wxBase*.dsp $(DISTDIR) + cp $(WXDIR)/src/wxBase*.dsw $(DISTDIR) cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt cp $(SRCDIR)/*.in $(DISTDIR)/src @@ -678,10 +688,11 @@ GTK_DIST: ALL_GUI_DIST cp -R $(WXDIR)/contrib $(DISTDIR) MOTIF_DIST: ALL_GUI_DIST - cp $(WXDIR)/wxMOTIF.spec $(DISTDIR) + cp $(WXDIR)/wxMotif.spec $(DISTDIR) cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif cp $(MOTIFDIR)/files.lst $(DISTDIR)/src/motif cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif + cp $(MOTIFDIR)/*.c $(DISTDIR)/src/motif cp $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif mkdir $(DISTDIR)/src/motif/xmcombo cp $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo @@ -1448,7 +1459,7 @@ cleanall: clean RPMTOP=_dist_dir/_rpm_top -rpm: dist +rpm: bzip-dist @echo "*** Building RPMs ***" -mkdir $(RPMTOP) -mkdir $(RPMTOP)/SOURCES @@ -1456,7 +1467,7 @@ rpm: dist -mkdir $(RPMTOP)/BUILD -mkdir $(RPMTOP)/RPMS -mkdir $(RPMTOP)/SRPMS - cp -f $(WXARCHIVE) $(RPMTOP)/SOURCES + cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec mv -f `find $(RPMTOP) -name "wx$(TARGET)*.rpm"` .