X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac57418f39e9671c18b99942180563146625d3ae..eeccd5d94ce6b11f36af95db4ac528a2e2e0c4c5:/src/Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 77861472e7..4d34f7e9c2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -27,7 +27,6 @@ IODBC_C_SRC=\
   iodbc/hstmt.c \
   iodbc/info.c \
   iodbc/itrace.c \
-  iodbc/main.c \
   iodbc/misc.c \
   iodbc/prepare.c \
   iodbc/result.c
@@ -103,6 +102,7 @@ install::
 	@$(WXBASEDIR)/mkinstalldirs \
 	   $(includedir)/wx \
 	   $(includedir)/wx/gtk \
+	   $(includedir)/wx/motif \
 	   $(includedir)/wx/common \
 	   $(includedir)/wx/generic \
 	   $(includedir)/wx/protocol \
@@ -120,13 +120,24 @@ install::
 	  rm -f $(includedir)/wx/$$f ; \
 	  $(INSTALL_DATA) $$f $(includedir)/wx/$$f ; \
 	done
-	@echo "  Copying headers from /include/wx/gtk"
-	@cd $(WXBASEDIR)/include/wx/gtk ; \
-	$(INSTALL) -d $(includedir)/wx/gtk ; \
-	for f in *.h ; do \
-	  rm -f $(includedir)/wx/gtk/$$f ; \
-	  $(INSTALL_DATA) $$f $(includedir)/wx/gtk/$$f ; \
-	done
+	@if test "@TOOLKIT@" = "GTK" ; then \
+	  echo "  Copying headers from /include/wx/gtk" ; \
+	  cd $(WXBASEDIR)/include/wx/gtk ; \
+	  $(INSTALL) -d $(includedir)/wx/gtk ; \
+	  for f in *.h ; do \
+	    rm -f $(includedir)/wx/gtk/$$f ; \
+	    $(INSTALL_DATA) $$f $(includedir)/wx/gtk/$$f ; \
+	  done ; \
+	fi
+	@if test "@TOOLKIT@" = "MOTIF" ; then \
+	  echo "  Copying headers from /include/wx/motif" ; \
+	  cd $(WXBASEDIR)/include/wx/motif ; \
+	  $(INSTALL) -d $(includedir)/wx/motif ; \
+	  for f in *.h ; do \
+	    rm -f $(includedir)/wx/motif/$$f ; \
+	    $(INSTALL_DATA) $$f $(includedir)/wx/motif/$$f ; \
+	  done ; \
+	fi
 	@echo "  Copying headers from /include/wx/generic"
 	@cd $(WXBASEDIR)/include/wx/generic ; \
 	$(INSTALL) -d $(includedir)/wx/generic ; \
@@ -141,9 +152,16 @@ install::
 	  $(INSTALL_DATA) $$f $(includedir)/wx/protocol/$$f ; \
 	done
 	@echo "  Moving setup.h to library path"
-	@cd $(WXBASEDIR)/src ; \
-	$(INSTALL) -d $(libdir)/wx/include/wx/gtk ;\
-	mv $(includedir)/wx/gtk/setup.h $(libdir)/wx/include/wx/gtk/setup.h ;
+	@if test "@TOOLKIT@" = "GTK" ; then \
+	  cd $(WXBASEDIR)/src ; \
+	  $(INSTALL) -d $(libdir)/wx/include/wx/gtk ; \
+	  mv $(includedir)/wx/gtk/setup.h $(libdir)/wx/include/wx/gtk/setup.h ; \
+	fi
+	@if test "@TOOLKIT@" = "MOTIF" ; then \
+	  cd $(WXBASEDIR)/src ; \
+	  $(INSTALL) -d $(libdir)/wx/include/wx/motif ; \
+	  mv $(includedir)/wx/motif/setup.h $(libdir)/wx/include/wx/motif/setup.h ; \
+	fi
 	@echo "  Copying wx-config"
 	@cd $(WXBASEDIR)/src ; \
 	  $(INSTALL) -d $(bindir) ; \