some very minor changes

[wxWidgets.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 370902040a473aad90491499c324c6749b17f7e8..850e6cb6f9c645582a4f9c5fa7fe7acb611463bd 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -14,6 +14,23 @@ OS=@OS@
 RULE=gslib
 
 # define common stuff
 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@
 
 # 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_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=\
 
 #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 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 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::
        @if test ! -d iodbc; then mkdir iodbc; fi
 
 install::


@@ -62,6 +79,10 @@ install::
        for f in *.h ; do \
          rm -f $(includedir)/wx/$$f ; \
          $(INSTALL_DATA) $$f $(includedir)/wx/$$f ; \
        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 ; \
        done
        @echo "  Copying headers from /include/wx/gtk"
        @cd $(WXBASEDIR)/include/wx/gtk ; \


@@ -69,7 +90,7 @@ install::
        for f in *.h ; do \
          rm -f $(includedir)/wx/gtk/$$f ; \
          $(INSTALL_DATA) $$f $(includedir)/wx/gtk/$$f ; \
        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 ; \
        @echo "  Copying headers from /include/wx/generic"
        @cd $(WXBASEDIR)/include/wx/generic ; \
        $(INSTALL) -d $(includedir)/wx/generic ; \


@@ -84,22 +105,22 @@ install::
          $(INSTALL_DATA) $$f $(includedir)/wx/protocol/$$f ; \
        done
        @echo "  Moving setup.h to library path"
          $(INSTALL_DATA) $$f $(includedir)/wx/protocol/$$f ; \
        done
        @echo "  Moving setup.h to library path"

-       @$(INSTALL) -d $(libdir)/wx/include/wx/gtk ;\
+       @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"
        mv $(includedir)/wx/gtk/setup.h $(libdir)/wx/include/wx/gtk/setup.h ;
        @echo "  Copying wx-config"

-       @cd $(WXBASEDIR) ; \
-         $(INSTALL) -d $(bindir) ;\
+       @cd $(WXBASEDIR)/src ; \
+         $(INSTALL) -d $(bindir) ; \

          rm -f $(bindir)/wx-config ; \
          rm -f $(bindir)/wx-config ; \

-         $(INSTALL_PROGRAM) wx-config $(bindir)/wx-config
+         $(INSTALL_PROGRAM) $(WXBASEDIR)/wx-config $(bindir)/wx-config

        @echo "  Copying static library"
        @echo "  Copying static library"

-       @cd $(WXBASEDIR)/lib/$(OS) ; \
+       @cd $(WXBASEDIR)/src ; \

          rm -f $(libdir)/$(STATIC_LIBRARY) ; \
          rm -f $(libdir)/$(STATIC_LIBRARY) ; \

-         $(INSTALL_DATA) $(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
-       @if test $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) ; then \
+         $(INSTALL_DATA) $(WXBASEDIR)/lib/$(OS)/$(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
+       @if test -f $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) ; then \

          echo "  Copying shared library" ; \
          echo "  Copying shared library" ; \

-         cd $(WXBASEDIR)/lib/$(OS) ; \

            rm -f $(libdir)/lib$(LIB_TARGET).so* ; \
            rm -f $(libdir)/lib$(LIB_TARGET).so* ; \

-           $(INSTALL_PROGRAM) $(SHARED_LIBRARY) $(libdir)/$(SHARED_LIBRARY) ; \
+           $(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 " " ; \
            $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so.$(LIB_MAJOR) ; \
            $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so ; \
            echo " " ; \


@@ -118,13 +139,11 @@ clean::
        $(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