Added a wxDataFormat::SetAtom() inline function.

[wxWidgets.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 8c6214edd45be6d70fc7da508f8595b41116ca34..ecb8a5804b26eac9f21d48d78f87b92af7658320 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -27,11 +27,59 @@ IODBC_C_SRC=\
   iodbc/hstmt.c \
   iodbc/info.c \
   iodbc/itrace.c \
   iodbc/hstmt.c \
   iodbc/info.c \
   iodbc/itrace.c \

-  iodbc/main.c \

   iodbc/misc.c \
   iodbc/prepare.c \
   iodbc/result.c
 
   iodbc/misc.c \
   iodbc/prepare.c \
   iodbc/result.c
 

+# define source file for jpeg
+JPEG_C_SRC=\
+  jpeg/jcapimin.c \
+  jpeg/jcapistd.c \
+  jpeg/jccoefct.c \
+  jpeg/jccolor.c \
+  jpeg/jcdctmgr.c \
+  jpeg/jchuff.c \
+  jpeg/jcinit.c \
+  jpeg/jcmainct.c \
+  jpeg/jcmarker.c \
+  jpeg/jcmaster.c \
+  jpeg/jcomapi.c \
+  jpeg/jcparam.c \
+  jpeg/jcphuff.c \
+  jpeg/jcprepct.c \
+  jpeg/jcsample.c \
+  jpeg/jctrans.c \
+  jpeg/jdapimin.c \
+  jpeg/jdapistd.c \
+  jpeg/jdatadst.c \
+  jpeg/jdatasrc.c \
+  jpeg/jdcoefct.c \
+  jpeg/jdcolor.c \
+  jpeg/jddctmgr.c \
+  jpeg/jdhuff.c \
+  jpeg/jdinput.c \
+  jpeg/jdmainct.c \
+  jpeg/jdmarker.c \
+  jpeg/jdmaster.c \
+  jpeg/jdmerge.c \
+  jpeg/jdphuff.c \
+  jpeg/jdpostct.c \
+  jpeg/jdsample.c \
+  jpeg/jdtrans.c \
+  jpeg/jerror.c \
+  jpeg/jfdctflt.c \
+  jpeg/jfdctfst.c \
+  jpeg/jfdctint.c \
+  jpeg/jidctflt.c \
+  jpeg/jidctfst.c \
+  jpeg/jidctint.c \
+  jpeg/jidctred.c \
+  jpeg/jquant1.c \
+  jpeg/jquant2.c \
+  jpeg/jutils.c \
+  jpeg/jmemmgr.c \
+  jpeg/jmemnobs.c 
+

 # define source file for png
 PNG_C_SRC=\
  png/png.c \
 # define source file for png
 PNG_C_SRC=\
  png/png.c \


@@ -77,7 +125,7 @@ SHARED_LIBRARY=lib$(LIB_TARGET).so.$(LIB_MAJOR).$(LIB_MINOR)
 LIB_CPP_ALL_SRC=$(LIB_CPP_SRC) @UNIX_THREAD@
 # @GTK_JOYSTICK@
 
 LIB_CPP_ALL_SRC=$(LIB_CPP_SRC) @UNIX_THREAD@
 # @GTK_JOYSTICK@
 

-LIB_C_ALL_SRC=$(LIB_C_SRC) @IODBC_C_SRC@ @PNG_C_SRC@ @Z_C_SRC@ parser.c
+LIB_C_ALL_SRC=$(LIB_C_SRC) @IODBC_C_SRC@ @PNG_C_SRC@ @Z_C_SRC@ @JPEG_C_SRC@ parser.c

 
 #define library objects
 LIB_OBJ=\
 
 #define library objects
 LIB_OBJ=\


@@ -90,8 +138,10 @@ all::
        @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 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 unix; then mkdir unix; fi

        @if test ! -d generic; then mkdir generic; fi
        @if test ! -d png; then mkdir png; fi
        @if test ! -d generic; then mkdir generic; fi
        @if test ! -d png; then mkdir png; fi

+       @if test ! -d jpeg; then mkdir jpeg; fi

        @if test ! -d zlib; then mkdir zlib; fi
        @if test ! -d iodbc; then mkdir iodbc; fi
 
        @if test ! -d zlib; then mkdir zlib; fi
        @if test ! -d iodbc; then mkdir iodbc; fi
 


@@ -104,7 +154,7 @@ install::
           $(includedir)/wx \
           $(includedir)/wx/gtk \
           $(includedir)/wx/motif \
           $(includedir)/wx \
           $(includedir)/wx/gtk \
           $(includedir)/wx/motif \

-          $(includedir)/wx/common \
+          $(includedir)/wx/unix \

           $(includedir)/wx/generic \
           $(includedir)/wx/protocol \
           $(libdir)/wx/include/wx/gtk \
           $(includedir)/wx/generic \
           $(includedir)/wx/protocol \
           $(libdir)/wx/include/wx/gtk \


@@ -152,13 +202,18 @@ install::
          rm -f $(includedir)/wx/protocol/$$f ; \
          $(INSTALL_DATA) $$f $(includedir)/wx/protocol/$$f ; \
        done
          rm -f $(includedir)/wx/protocol/$$f ; \
          $(INSTALL_DATA) $$f $(includedir)/wx/protocol/$$f ; \
        done

+       @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

        @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
        @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

-       @echo "  Moving setup.h to library path"

        @if test "@TOOLKIT@" = "MOTIF" ; then \
          cd $(WXBASEDIR)/src ; \
          $(INSTALL) -d $(libdir)/wx/include/wx/motif ; \
        @if test "@TOOLKIT@" = "MOTIF" ; then \
          cd $(WXBASEDIR)/src ; \
          $(INSTALL) -d $(libdir)/wx/include/wx/motif ; \


@@ -177,6 +232,7 @@ install::
          echo "  Copying shared library" ; \
            rm -f $(libdir)/lib$(LIB_TARGET).so* ; \
            $(INSTALL_PROGRAM) $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) $(libdir)/$(SHARED_LIBRARY) ; \
          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 " " ; \
            $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so.$(LIB_MAJOR) ; \
            $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so ; \
            echo " " ; \


@@ -192,8 +248,10 @@ clean::
        $(RM) -rf qt
        $(RM) -rf motif
        $(RM) -rf common
        $(RM) -rf qt
        $(RM) -rf motif
        $(RM) -rf common

+       $(RM) -rf unix

        $(RM) -rf generic
        $(RM) -rf png
        $(RM) -rf generic
        $(RM) -rf png

+       $(RM) -rf jpeg

        $(RM) -rf zlib
        $(RM) -rf iodbc
        @$(RM) lexer.c parser.c
        $(RM) -rf zlib
        $(RM) -rf iodbc
        @$(RM) lexer.c parser.c