X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c26969c48d904003c1af8b67527e805a643afec..9d2f3c71d83c52fc4db6c8041de533562816b1d6:/src/Makefile.in diff --git a/src/Makefile.in b/src/Makefile.in index af01094ec6..a46ddf7abc 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -89,11 +89,11 @@ all:: @if test ! -d motif; then mkdir motif; fi @if test ! -d motif/xmcombo; then mkdir motif/xmcombo; fi @if test ! -d common; then mkdir common; fi + @if test ! -d unix; then mkdir unix; fi @if test ! -d generic; then mkdir generic; fi @if test ! -d png; then mkdir png; fi @if test ! -d zlib; then mkdir zlib; fi @if test ! -d iodbc; then mkdir iodbc; fi - @if test ! -d unix; then mkdir unix; fi install:: @echo " " @@ -104,7 +104,7 @@ install:: $(includedir)/wx \ $(includedir)/wx/gtk \ $(includedir)/wx/motif \ - $(includedir)/wx/common \ + $(includedir)/wx/unix \ $(includedir)/wx/generic \ $(includedir)/wx/protocol \ $(libdir)/wx/include/wx/gtk \ @@ -152,6 +152,12 @@ install:: rm -f $(includedir)/wx/protocol/$$f ; \ $(INSTALL_DATA) $$f $(includedir)/wx/protocol/$$f ; \ done + @echo " Copying headers from /include/wx/unix" + @cd $(WXBASEDIR)/include/wx/unix ; \ + for f in *.h ; do \ + rm -f $(includedir)/wx/unix/$$f ; \ + $(INSTALL_DATA) $$f $(includedir)/wx/unix/$$f ; \ + done @echo " Moving setup.h to library path" @if test "@TOOLKIT@" = "GTK" ; then \ cd $(WXBASEDIR)/src ; \ @@ -176,6 +182,7 @@ install:: echo " Copying shared library" ; \ rm -f $(libdir)/lib$(LIB_TARGET).so* ; \ $(INSTALL_PROGRAM) $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) $(libdir)/$(SHARED_LIBRARY) ; \ + $(STRIP) $(libdir)/$(SHARED_LIBRARY) ; \ $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so.$(LIB_MAJOR) ; \ $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so ; \ echo " " ; \ @@ -191,6 +198,7 @@ clean:: $(RM) -rf qt $(RM) -rf motif $(RM) -rf common + $(RM) -rf unix $(RM) -rf generic $(RM) -rf png $(RM) -rf zlib