Implement gdkcc (visually broken, but can be fixed by someone with a clue

[~andy/gtk] / gdk / Makefile.am

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 7da2e99dcfa04771f6b548d84c91124c2f7199eb..74a22fe00b36980990844db56c8b9b1177c85be4 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -6,19 +6,21 @@ DIST_SUBDIRS=linux-fb nanox win32 x11
 EXTRA_DIST =   \
        gdkconfig.h.win32 \
        gdk.def \
-       makefile.cygwin \
+       makefile.mingw \
+       makefile.mingw.in \
        makefile.msc
 
-common_includes = @STRIP_BEGIN@ \
-       -DG_LOG_DOMAIN=\"Gdk\"  \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/gdk   \
-       @GTK_DEBUG_FLAGS@       \
-       @GTK_XIM_FLAGS@         \
-       @GTK_LOCALE_FLAGS@      \
-       @PANGO_CFLAGS@          \
-       @GLIB_CFLAGS@           \
-       @more_cflags@           \
+common_includes = @STRIP_BEGIN@        \
+       -DG_LOG_DOMAIN=\"Gdk\"          \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/gdk           \
+       -I$(top_srcdir)/gdk-pixbuf      \
+       @GTK_DEBUG_FLAGS@               \
+       @GTK_XIM_FLAGS@                 \
+       @GTK_LOCALE_FLAGS@              \
+       @PANGO_CFLAGS@                  \
+       @GLIB_CFLAGS@                   \
+       @more_cflags@                   \
 @STRIP_END@
 
 INCLUDES = $(common_includes)
@@ -29,9 +31,9 @@ gtarget=@gdktarget@
 # we use the general approach here
 LDFLAGS = @STRIP_BEGIN@                                        \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
-       -release $(LT_RELEASE)                                  \
        -export-dynamic                                         \
        -rpath @prefix@/lib                                     \
+       -L../gdk-pixbuf/.libs -lgdk_pixbuf-1.3                  \
        @PANGO_LIBS@                                            \
        @GLIB_DEPLIBS@                                          \
        @more_ldflags@                                          \
@@ -65,6 +67,7 @@ gdk_public_h_sources = @STRIP_BEGIN@ \
        gdkimage.h      \
        gdkinput.h      \
        gdkpango.h      \
+       gdkpixbuf.h     \
        gdkpixmap.h     \
        gdkprivate.h    \
        gdkproperty.h   \
@@ -89,6 +92,8 @@ gdk_c_sources = @STRIP_BEGIN@         \
        gdkimage.c              \
        gdkinternals.h          \
        gdkpango.c              \
+       gdkpixbuf-drawable.c    \
+       gdkpixbuf-render.c      \
        gdkpixmap.c             \
        gdkpoly-generic.h       \
        gdkpolyreg-generic.c    \
@@ -105,39 +110,39 @@ gdk_c_sources = @STRIP_BEGIN@     \
 extra = @gdktargetlib@
 
 if USE_X11
-libgdk_x11_includedir = $(includedir)/gdk
+libgdk_x11_includedir = $(includedir)/gtk-2.0/gdk
 
-libgdk_x11_la_LIBADD = \
+libgdk_x11_1_3_la_LIBADD = \
        $(gtarget)/libgdk-$(gtarget).la 
 
 libgdk_x11_include_HEADERS = $(gdk_public_h_sources)
-libgdk_x11_la_SOURCES = $(gdk_c_sources)
+libgdk_x11_1_3_la_SOURCES = $(gdk_c_sources)
 endif
 
 if USE_NANOX
-libgdk_nanox_includedir = $(includedir)/gdk
+libgdk_nanox_includedir = $(includedir)/gtk-2.0/gdk
 
-libgdk_nanox_la_LIBADD = \
+libgdk_nanox_1_3_la_LIBADD = \
        $(gtarget)/libgdk-$(gtarget).la 
 
 libgdk_nanox_include_HEADERS = $(gdk_public_h_sources)
-libgdk_nanox_la_SOURCES = $(gdk_c_sources)
+libgdk_nanox_1_3_la_SOURCES = $(gdk_c_sources)
 endif
 
 if USE_LINUX_FB
-libgdk_linux_fb_includedir = $(includedir)/gdk
+libgdk_linux_fb_includedir = $(includedir)/gtk-2.0/gdk
 
-libgdk_linux_fb_la_LIBADD = \
+libgdk_linux_fb_1_3_la_LIBADD = \
        $(gtarget)/libgdk-$(gtarget).la 
 
 libgdk_linux_fb_include_HEADERS = $(gdk_public_h_sources)
-libgdk_linux_fb_la_SOURCES = $(gdk_c_sources)
+libgdk_linux_fb_1_3_la_SOURCES = $(gdk_c_sources)
 endif
 
 # now define the real one to workaround automake's mishandling
 lib_LTLIBRARIES = $(extra)
 
-EXTRA_LTLIBRARIES = libgdk-x11.la libgdk-nanox.la libgdk-linux-fb.la
+EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-nanox-1.3.la libgdk-linux-fb-1.3.la
 
 MAINTAINERCLEANFILES +=
 EXTRA_HEADERS +=
@@ -160,7 +165,7 @@ X-derived-headers:
 #
 # Rule to install gdkconfig.h header file
 #
-configexecincludedir = $(pkglibdir)/include
+configexecincludedir = $(libdir)/gtk-2.0/include
 #configexecinclude_DATA = gdkconfig.h
 install-exec-local: gdkconfig.h
        $(mkinstalldirs) $(DESTDIR)$(configexecincludedir)
@@ -176,6 +181,9 @@ stamp-gc-h: ../config.status
        cd .. && CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=gdk/gdkconfig.h ./config.status
        echo timestamp > stamp-gc-h
 
+makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gdk/makefile.mingw.in
+       cd $(top_builddir) && CONFIG_FILES=gdk/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
 .PHONY: files
 
 files: