wxGTK compiles (and links) when configured without threads

[wxWidgets.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 481eda7e0ecf18b56ff692c786f80f3f836d473e..717194b05427aaa080d7daae07b6d7a5b659e74d 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -39,7 +39,8 @@ include @MAKEINCLUDE@
 STATIC_LIBRARY=lib$(LIB_TARGET).a
 SHARED_LIBRARY=lib$(LIB_TARGET).so.$(LIB_MAJOR).$(LIB_MINOR)
 
-LIB_CPP_ALL_SRC=$(LIB_CPP_SRC) @GTK_JOYSTICK@ @UNIX_THREAD@
+LIB_CPP_ALL_SRC=$(LIB_CPP_SRC) @UNIX_THREAD@
+# @GTK_JOYSTICK@
 
 LIB_C_ALL_SRC=$(LIB_C_SRC) @IODBC_C_SRC@ parser.c
 
@@ -79,6 +80,10 @@ install::
        for f in *.h ; do \
          rm -f $(includedir)/wx/$$f ; \
          $(INSTALL_DATA) $$f $(includedir)/wx/$$f ; \
+       done ; \
+       for f in *.cpp ; do \
+         rm -f $(includedir)/wx/$$f ; \
+         $(INSTALL_DATA) $$f $(includedir)/wx/$$f ; \
        done
        @echo "  Copying headers from /include/wx/gtk"
        @cd $(WXBASEDIR)/include/wx/gtk ; \
@@ -86,7 +91,7 @@ install::
        for f in *.h ; do \
          rm -f $(includedir)/wx/gtk/$$f ; \
          $(INSTALL_DATA) $$f $(includedir)/wx/gtk/$$f ; \
-       done ;
+       done
        @echo "  Copying headers from /include/wx/generic"
        @cd $(WXBASEDIR)/include/wx/generic ; \
        $(INSTALL) -d $(includedir)/wx/generic ; \
@@ -115,7 +120,6 @@ install::
          $(INSTALL_DATA) $(WXBASEDIR)/lib/$(OS)/$(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
        @if test -f $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) ; then \
          echo "  Copying shared library" ; \
-          @cd $(WXBASEDIR)/src ; \
            rm -f $(libdir)/lib$(LIB_TARGET).so* ; \
            $(INSTALL_PROGRAM) $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) $(libdir)/$(SHARED_LIBRARY) ; \
            $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so.$(LIB_MAJOR) ; \