X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd8914bc51d9939db3dc9325b31adcc76bb0dded..636d266b8993dd831aa47bdd7e673be32166b54a:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 312a24b88b..acfa397aed 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,13 +17,13 @@ include ./src/make.env ############## override make.env for PIC ########################## %.o : %.c - $(CC) -c $(CFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $< + $(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $< %.o : %.cpp - $(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $< + $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $< %.o : %.cxx - $(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $< + $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $< %.r : %.rsrc $(DEREZ) $^ Carbon.r -useDF > $@ @@ -315,11 +315,13 @@ all: @WX_ALL@ $(build_libdir)/@WX_LIBRARY_NAME_STATIC@: $(OBJECTS) @$(INSTALL) -d $(build_libdir) + @$(RM) $@ $(AR) $(AROPTIONS) $@ $(OBJECTS) $(RANLIB) $@ $(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o @$(INSTALL) -d $(build_libdir) + @$(RM) $@ $(AR) $(AROPTIONS) $@ glcanvas.o $(RANLIB) $@ @@ -352,7 +354,7 @@ $(build_libdir)/@WX_LIBRARY_LINK1_GL@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED_G $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h parser.o: parser.c lexer.c - $(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c + $(CCLEX) -c $(CFLAGS) -I. $(PICFLAGS) -o $@ parser.c parser.c: $(COMMDIR)/parser.y lexer.c $(YACC) $(COMMDIR)/parser.y @@ -411,6 +413,8 @@ 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@ + @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ + $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi $(INSTALL) -d $(libdir)/wx $(INSTALL) -d $(libdir)/wx/include @@ -424,6 +428,8 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM @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 @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi + @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi + $(INSTALL) -d $(includedir)/wx/protocol $(INSTALL) -d $(includedir)/wx/unix @list='$(HEADERS)'; for p in $$list; do \ @@ -439,6 +445,13 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \ done +preinstall_res: $(build_libdir)/@WX_RESOURCES_MACOSX_COMPILED@ + @echo " " + @echo " Installing wxWindows Mac resource ..." + @echo " " + @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi + $(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_COMPILED@ $(libdir)/@WX_RESOURCES_MACOSX_COMPILED@ + preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@ @echo " " @echo " Installing wxWindows OpenGl add-on..." @@ -511,6 +524,7 @@ uninstall: ALL_DIST: distclean mkdir _dist_dir mkdir $(DISTDIR) + cp $(WXDIR)/aclocal.m4 $(DISTDIR) cp $(WXDIR)/configure.in $(DISTDIR) cp $(WXDIR)/configure $(DISTDIR) cp $(WXDIR)/config.sub $(DISTDIR) @@ -532,18 +546,23 @@ ALL_DIST: distclean mkdir $(DISTDIR)/src/zlib cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib + cp $(ZLIBDIR)/*.mcp $(DISTDIR)/src/zlib cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib mkdir $(DISTDIR)/src/regex - cp $(REGEXDIR)/*.{i,}h $(DISTDIR)/src/regex + cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex + cp $(REGEXDIR)/*.ih $(DISTDIR)/src/regex cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex - cp $(REGEXDIR)/{Makefile,COPYRIGHT,README,WHATSNEW} $(DISTDIR)/src/regex - cp $(REGEXDIR)/{mkh,tests} $(DISTDIR)/src/regex + cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex + cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex + cp $(REGEXDIR)/README $(DISTDIR)/src/regex + cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex + cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex + cp $(REGEXDIR)/tests $(DISTDIR)/src/regex # this target is the common part of distribution script for all GUI toolkits, # but is not used when building wxBase distribution ALL_GUI_DIST: ALL_DIST - cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR) cp $(WXDIR)/wxBase.spec $(DISTDIR) cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt @@ -592,12 +611,15 @@ ALL_GUI_DIST: ALL_DIST cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps cp $(PNGDIR)/*.h $(DISTDIR)/src/png cp $(PNGDIR)/*.c $(DISTDIR)/src/png + cp $(PNGDIR)/*.mcp $(DISTDIR)/src/png cp $(PNGDIR)/README $(DISTDIR)/src/png cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg + cp $(JPEGDIR)/*.mcp $(DISTDIR)/src/jpeg cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff + cp $(TIFFDIR)/*.mcp $(DISTDIR)/src/tiff cp $(TIFFDIR)/README $(DISTDIR)/src/tiff cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc @@ -614,10 +636,11 @@ BASE_DIST: ALL_DIST mkdir $(DISTDIR)/include/wx/unix mkdir $(DISTDIR)/src/common mkdir $(DISTDIR)/src/unix + cp $(WXDIR)/wxBase.spec $(DISTDIR) cp @PORT_FILES@ $(DISTDIR) cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@ - cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@ - cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR) + cp $(WXDIR)/wxBase*.dsp $(DISTDIR) + cp $(WXDIR)/wxBase*.dsw $(DISTDIR) cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt cp $(SRCDIR)/*.in $(DISTDIR)/src @@ -643,6 +666,7 @@ BASE_DIST: ALL_DIST cp $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console GTK_DIST: ALL_GUI_DIST + cp $(WXDIR)/wxGTK.spec $(DISTDIR) cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk cp $(GTKDIR)/files.lst $(DISTDIR)/src/gtk @@ -665,24 +689,27 @@ MOTIF_DIST: ALL_GUI_DIST cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo MACX_DIST: ALL_GUI_DIST + cp $(INCDIR)/*.* $(DISTDIR)/include cp $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac + cp $(SRCDIR)/*.mcp $(DISTDIR)/src cp $(MACDIR)/files.lst $(DISTDIR)/src/mac cp $(MACDIR)/*.cpp $(DISTDIR)/src/mac cp $(MACDIR)/*.c $(DISTDIR)/src/mac + cp $(MACDIR)/*.h $(DISTDIR)/src/mac + cp $(MACDIR)/*.r $(DISTDIR)/src/mac mkdir $(DISTDIR)/src/mac/morefile cp $(MACDIR)/morefile/*.h $(DISTDIR)/src/mac/morefile - cp $(MACDIR)/morefile/*.cpp $(DISTDIR)/src/mac/morefile + cp $(MACDIR)/morefile/*.c $(DISTDIR)/src/mac/morefile mkdir $(DISTDIR)/src/mac/cdef cp $(MACDIR)/cdef/*.h $(DISTDIR)/src/mac/cdef - cp $(MACDIR)/cdef/*.cpp $(DISTDIR)/src/mac/cdef + cp $(MACDIR)/cdef/*.c $(DISTDIR)/src/mac/cdef cp $(MACDIR)/cdef/*.mcp $(DISTDIR)/src/mac/cdef mkdir $(DISTDIR)/src/mac/ldef cp $(MACDIR)/ldef/*.h $(DISTDIR)/src/mac/ldef - cp $(MACDIR)/ldef/*.cpp $(DISTDIR)/src/mac/ldef + cp $(MACDIR)/ldef/*.c $(DISTDIR)/src/mac/ldef cp $(MACDIR)/ldef/*.mcp $(DISTDIR)/src/mac/cdef - mkdir $(DISTDIR)/src/mac/morefile - cp $(MACDIR)/morefile/*.c $(DISTDIR)/src/mac/morefile - cp $(MACDIR)/morefile/*.h $(DISTDIR)/src/mac/morefile + mkdir $(DISTDIR)/src/mac/macsock + cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock MSW_DIST: ALL_GUI_DIST cp $(WXDIR)/wxWINE.spec $(DISTDIR) @@ -775,6 +802,7 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/calendar cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar + cp $(SAMPDIR)/calendar/*.mcp $(DISTDIR)/samples/calendar cp $(SAMPDIR)/calendar/*.cpp $(DISTDIR)/samples/calendar mkdir $(DISTDIR)/samples/caret @@ -786,6 +814,7 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst + cp $(SAMPDIR)/checklst/*.mcp $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/*.mms $(DISTDIR)/samples/checklst @@ -793,6 +822,7 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/config cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config cp $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config + cp $(SAMPDIR)/config/*.mcp $(DISTDIR)/samples/config cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config mkdir $(DISTDIR)/samples/console @@ -804,6 +834,7 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/controls/icons cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls + cp $(SAMPDIR)/controls/*.mcp $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/*.mms $(DISTDIR)/samples/controls @@ -819,6 +850,7 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/dialogs cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs cp $(SAMPDIR)/dialogs/makefile.unx $(DISTDIR)/samples/dialogs + cp $(SAMPDIR)/dialogs/*.mcp $(DISTDIR)/samples/dialogs cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs @@ -1211,7 +1243,9 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/widgets mkdir $(DISTDIR)/samples/widgets/icons cp $(SAMPDIR)/widgets/Makefile.in $(DISTDIR)/samples/widgets - cp $(SAMPDIR)/widgets/*.{cpp,h,rc} $(DISTDIR)/samples/widgets + cp $(SAMPDIR)/widgets/*.cpp $(DISTDIR)/samples/widgets + cp $(SAMPDIR)/widgets/*.h $(DISTDIR)/samples/widgets + cp $(SAMPDIR)/widgets/*.rc $(DISTDIR)/samples/widgets cp $(SAMPDIR)/widgets/icons/*.xpm $(DISTDIR)/samples/widgets/icons UTILS_DIST: ALL_GUI_DIST @@ -1262,6 +1296,7 @@ MANUAL_DIST: mkdir $(DISTDIR)/docs/latex mkdir $(DISTDIR)/docs/latex/wx cp $(DOCDIR)/latex/wx/*.tex $(DISTDIR)/docs/latex/wx + cp $(DOCDIR)/latex/wx/*.inc $(DISTDIR)/docs/latex/wx cp $(DOCDIR)/latex/wx/*.gif $(DISTDIR)/docs/latex/wx cp $(DOCDIR)/latex/wx/*.ini $(DISTDIR)/docs/latex/wx cp $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx @@ -1277,6 +1312,7 @@ PYTHON_DIST: mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk mkdir $(DISTDIR)/wxPython/contrib/ogl mkdir $(DISTDIR)/wxPython/contrib/stc + mkdir $(DISTDIR)/wxPython/contrib/stc/gtk mkdir $(DISTDIR)/wxPython/contrib/xrc mkdir $(DISTDIR)/wxPython/demo mkdir $(DISTDIR)/wxPython/demo/bitmaps @@ -1296,6 +1332,7 @@ PYTHON_DIST: cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk -cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl -cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc + -cp $(WXDIR)/wxPython/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk -cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc -cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo -cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps