Pending() and Dispatch() implemented

[wxWidgets.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index c9dac317330188026cac241d6308d2ee0f044ef7..a46ddf7abc86ee1b838a9c11c447e9933bbdb535 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -13,14 +13,70 @@ OS=@OS@
 # compile a library only
 RULE=gslib
 
 # 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@
 
 # include gtk.inc, qt.inc or motif.inc here
 include @MAKEINCLUDE@
 

-LIB_CPP_ALL_SRC=$(LIB_CPP_SRC) @GTK_JOYSTICK@ @UNIX_THREAD@
+# determine library names
+STATIC_LIBRARY=lib$(LIB_TARGET).a
+SHARED_LIBRARY=lib$(LIB_TARGET).so.$(LIB_MAJOR).$(LIB_MINOR)
+
+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=\
 
 #define library objects
 LIB_OBJ=\


@@ -31,67 +87,126 @@ 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 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 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 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::
        @if test ! -d iodbc; then mkdir iodbc; fi
 
 install::

+       @echo " "

        @echo "Installing library files and headers.."
        @echo "Installing library files and headers.."

+       @echo " "

        @echo "  Creating directories.."
        @$(WXBASEDIR)/mkinstalldirs \
        @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/motif \
+          $(includedir)/wx/unix \
+          $(includedir)/wx/generic \
+          $(includedir)/wx/protocol \
+          $(libdir)/wx/include/wx/gtk \
+          $(libdir) \
+          $(bindir)

        @echo "  Copying headers from /include/wx"
        @cd $(WXBASEDIR)/include/wx ; \
        @echo "  Copying headers from /include/wx"
        @cd $(WXBASEDIR)/include/wx ; \

+       $(INSTALL) -d $(includedir)/wx ; \

        for f in *.h ; do \
        for f in *.h ; do \

-         rm -f /usr/local/include/wx/$$f ; \
-         $(INSTALL_DATA) $$f /usr/local/include/wx/$$f ; \
-       done
-       @echo "  Copying headers from /include/wx/gtk"
-       @cd $(WXBASEDIR)/include/wx/gtk ; \
-       for f in *.h ; do \
-         rm -f /usr/local/include/wx/gtk/$$f ; \
-         $(INSTALL_DATA) $$f /usr/local/include/wx/gtk/$$f ; \
+         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
        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 ; \
        @echo "  Copying headers from /include/wx/generic"
        @cd $(WXBASEDIR)/include/wx/generic ; \

+       $(INSTALL) -d $(includedir)/wx/generic ; \

        for f in *.h ; do \
        for f in *.h ; do \

-         rm -f /usr/local/include/wx/generic/$$f ; \
-         $(INSTALL_DATA) $$f /usr/local/include/wx/generic/$$f ; \
+         rm -f $(includedir)/wx/generic/$$f ; \
+         $(INSTALL_DATA) $$f $(includedir)/wx/generic/$$f ; \

        done
        done

-       @echo "  Copying static libraries files to /usr/local/lib"
-       @cd $(WXBASEDIR)/lib/$(OS) ; \
-       for f in libwx_gtk.a ; do \
-         rm -f /usr/local/lib/$$f ; \
-         $(INSTALL_DATA) $$f /usr/local/lib/$$f ; \
+       @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
        done

-       @echo "  Copying shared libraries to /usr/local/lib"
-       @cd $(WXBASEDIR)/lib/$(OS) ; \
-       for f in libwx_gtk.so* ; do \
-         rm -f /usr/local/lib/$$f ; \
-         $(INSTALL_PROGRAM) $$f /usr/local/lib/$$f ; \
+       @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
        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)/src ; \
+         $(INSTALL) -d $(bindir) ; \
+         rm -f $(bindir)/wx-config ; \
+         $(INSTALL_PROGRAM) $(WXBASEDIR)/wx-config $(bindir)/wx-config
+       @echo "  Copying static library"
+       @cd $(WXBASEDIR)/src ; \
+         rm -f $(libdir)/$(STATIC_LIBRARY) ; \
+         $(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) ; \
+           $(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 " " ; \
+           echo "  You may have to run ldconfig!" ; \
+           echo " " ; \
+       fi
+       @echo " "
+       @echo "Installation complete."
+       @echo " "

        
 clean::
        $(RM) -rf gtk
        $(RM) -rf qt
        $(RM) -rf motif
        $(RM) -rf common
        
 clean::
        $(RM) -rf gtk
        $(RM) -rf qt
        $(RM) -rf motif
        $(RM) -rf common

+       $(RM) -rf unix

        $(RM) -rf generic
        $(RM) -rf png
        $(RM) -rf zlib
        $(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
        $(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
 
 # include the definitions now
 include ../../template.mak


@@ -125,4 +240,4 @@ lexer.c: ../common/lexer.l
        @$(RM) lexer.l
 
 clean::
        @$(RM) lexer.l
 
 clean::

-       
\ No newline at end of file
+