X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/337d7956cc2515114f1496152b07aa695f76d08b..c3deb08b3b49f285bd1da9fd304b6937b1407038:/src/Makefile.in diff --git a/src/Makefile.in b/src/Makefile.in index acf8182d8e..4d34f7e9c2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -13,8 +13,59 @@ OS=@OS@ # compile a library only RULE=gslib -# define common stuff - +# define source file for odbc +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/misc.c \ + iodbc/prepare.c \ + iodbc/result.c + +# define source file for png +PNG_C_SRC=\ + png/png.c \ + png/pngset.c \ + png/pngget.c \ + png/pngrutil.c \ + png/pngtrans.c \ + png/pngwutil.c \ + png/pngread.c \ + png/pngrio.c \ + png/pngwio.c \ + png/pngwrite.c \ + png/pngrtran.c \ + png/pngwtran.c \ + png/pngmem.c \ + png/pngerror.c \ + png/pngpread.c + +# define source file for zlib +Z_C_SRC=\ + zlib/adler32.c \ + zlib/compress.c \ + zlib/crc32.c \ + zlib/gzio.c \ + zlib/uncompr.c \ + zlib/deflate.c \ + zlib/trees.c \ + zlib/zutil.c \ + zlib/inflate.c \ + zlib/infblock.c \ + zlib/inftrees.c \ + zlib/infcodes.c \ + zlib/infutil.c \ + zlib/inffast.c + # include gtk.inc, qt.inc or motif.inc here include @MAKEINCLUDE@ @@ -22,9 +73,10 @@ 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) parser.c +LIB_C_ALL_SRC=$(LIB_C_SRC) @IODBC_C_SRC@ @PNG_C_SRC@ @Z_C_SRC@ parser.c #define library objects LIB_OBJ=\ @@ -35,11 +87,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,27 +100,44 @@ install:: @echo " " @echo " Creating directories.." @$(WXBASEDIR)/mkinstalldirs \ - @prefix@/include/wx \ - @prefix@/include/wx/gtk \ - @prefix@/include/wx/common \ - @prefix@/include/wx/generic \ - @prefix@/include/wx/protocol \ + $(includedir)/wx \ + $(includedir)/wx/gtk \ + $(includedir)/wx/motif \ + $(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 - @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 ; \ - $(INSTALL) -d $(includedir)/wx/@host@/wx/gtk ;\ - mv $(includedir)/wx/gtk/setup.h $(includedir)/wx/@host@/wx/gtk/setup.h ;\ + for f in *.cpp ; do \ + rm -f $(includedir)/wx/$$f ; \ + $(INSTALL_DATA) $$f $(includedir)/wx/$$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 ; \ @@ -82,27 +151,40 @@ install:: rm -f $(includedir)/wx/protocol/$$f ; \ $(INSTALL_DATA) $$f $(includedir)/wx/protocol/$$f ; \ done + @echo " Moving setup.h to library path" + @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) ; \ - $(INSTALL) -d $(bindir) ;\ + @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" - $(INSTALL) -d $(libdir) ;\ - @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 @@ -111,13 +193,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