X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11bc0805dec30cdc07c17cc13d075520efd4e17a..3d7e30a4186cc3379c3b21040712181a3c6d0b3b:/src/Makefile.in?ds=sidebyside

diff --git a/src/Makefile.in b/src/Makefile.in
index 02b147b133..850e6cb6f9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -14,6 +14,23 @@ OS=@OS@
 RULE=gslib
 
 # define common stuff
+IODBC_C_SRC=\
+  iodbc/catalog.c \
+  iodbc/connect.c \
+  iodbc/dlf.c \
+  iodbc/dlproc.c \
+  iodbc/execute.c \
+  iodbc/fetch.c \
+  iodbc/hdbc.c \
+  iodbc/henv.c \
+  iodbc/herr.c \
+  iodbc/hstmt.c \
+  iodbc/info.c \
+  iodbc/itrace.c \
+  iodbc/main.c \
+  iodbc/misc.c \
+  iodbc/prepare.c \
+  iodbc/result.c
 
 # include gtk.inc, qt.inc or motif.inc here
 include @MAKEINCLUDE@
@@ -24,7 +41,7 @@ SHARED_LIBRARY=lib$(LIB_TARGET).so.$(LIB_MAJOR).$(LIB_MINOR)
 
 LIB_CPP_ALL_SRC=$(LIB_CPP_SRC) @GTK_JOYSTICK@ @UNIX_THREAD@
 
-LIB_C_ALL_SRC=$(LIB_C_SRC) parser.c
+LIB_C_ALL_SRC=$(LIB_C_SRC) @IODBC_C_SRC@ parser.c
 
 #define library objects
 LIB_OBJ=\
@@ -35,11 +52,11 @@ all::
 	@if test ! -d gtk; then mkdir gtk; fi
 	@if test ! -d qt; then mkdir qt; fi
 	@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 generic; then mkdir generic; fi
 	@if test ! -d png; then mkdir png; fi
 	@if test ! -d zlib; then mkdir zlib; fi
-	@if test ! -d gdk_imlib; then mkdir gdk_imlib; fi
 	@if test ! -d iodbc; then mkdir iodbc; fi
 
 install::
@@ -48,47 +65,72 @@ install::
 	@echo " "
 	@echo "  Creating directories.."
 	@$(WXBASEDIR)/mkinstalldirs \
-	   /usr/local/include/wx \
-	   /usr/local/include/wx/gtk \
-	   /usr/local/include/wx/common \
-	   /usr/local/include/wx/generic
+	   $(includedir)/wx \
+	   $(includedir)/wx/gtk \
+	   $(includedir)/wx/common \
+	   $(includedir)/wx/generic \
+	   $(includedir)/wx/protocol \
+	   $(libdir)/wx/include/wx/gtk \
+	   $(libdir) \
+	   $(bindir)
 	@echo "  Copying headers from /include/wx"
 	@cd $(WXBASEDIR)/include/wx ; \
+	$(INSTALL) -d $(includedir)/wx ; \
 	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 ; \
+	$(INSTALL) -d $(includedir)/wx/gtk ; \
 	for f in *.h ; do \
 	  rm -f $(includedir)/wx/gtk/$$f ; \
 	  $(INSTALL_DATA) $$f $(includedir)/wx/gtk/$$f ; \
 	done
 	@echo "  Copying headers from /include/wx/generic"
 	@cd $(WXBASEDIR)/include/wx/generic ; \
+	$(INSTALL) -d $(includedir)/wx/generic ; \
 	for f in *.h ; do \
 	  rm -f $(includedir)/wx/generic/$$f ; \
 	  $(INSTALL_DATA) $$f $(includedir)/wx/generic/$$f ; \
 	done
+	@echo "  Copying headers from /include/wx/protocol"
+	@cd $(WXBASEDIR)/include/wx/protocol ; \
+	for f in *.h ; do \
+	  rm -f $(includedir)/wx/protocol/$$f ; \
+	  $(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 ;
 	@echo "  Copying wx-config"
-	@cd $(WXBASEDIR) ; \
+	@cd $(WXBASEDIR)/src ; \
+	  $(INSTALL) -d $(bindir) ; \
 	  rm -f $(bindir)/wx-config ; \
-	  $(INSTALL_PROGRAM) wx-config $(bindir)/wx-config
+	  $(INSTALL_PROGRAM) $(WXBASEDIR)/wx-config $(bindir)/wx-config
 	@echo "  Copying static library"
-	@cd $(WXBASEDIR)/lib/$(OS) ; \
+	@cd $(WXBASEDIR)/src ; \
 	  rm -f $(libdir)/$(STATIC_LIBRARY) ; \
-	  $(INSTALL_DATA) $(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
-	@echo "  Copying shared library"
-	@cd $(WXBASEDIR)/lib/$(OS) ; \
-	  rm -f $(libdir)/$(SHARED_LIBRARY) ; \
-	  $(INSTALL_PROGRAM) $(SHARED_LIBRARY) $(libdir)/$(SHARED_LIBRARY) ; \
-	  $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so.$(LIB_MAJOR) ; \
-	  $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so
+	  $(INSTALL_DATA) $(WXBASEDIR)/lib/$(OS)/$(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
+	@if test -f $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) ; then \
+	  echo "  Copying shared library" ; \
+	    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) ; \
+	    $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so ; \
+	    echo " " ; \
+	    echo "  You may have to run ldconfig!" ; \
+	    echo " " ; \
+	fi
 	@echo " "
-	@echo "Installation complete. You may have to run ldconfig!"
+	@echo "Installation complete."
 	@echo " "
 	
-	
 clean::
 	$(RM) -rf gtk
 	$(RM) -rf qt
@@ -97,13 +139,11 @@ clean::
 	$(RM) -rf generic
 	$(RM) -rf png
 	$(RM) -rf zlib
-	$(RM) -rf gdk_imlib
 	$(RM) -rf iodbc
 	@$(RM) lexer.c parser.c
 
 #additional things needed for compile
-ADD_COMPILE= \
-   -DHAVE_LIBPNG -DDJPEG_PROG=\"\" -DCJPEG_PROG=\"\"
+ADD_COMPILE=
 
 # include the definitions now
 include ../../template.mak
@@ -137,4 +177,4 @@ lexer.c: ../common/lexer.l
 	@$(RM) lexer.l
 
 clean::
-	
\ No newline at end of file
+