Add rule for make-inline-pixbuf. Use gdk-pixbuf's version number in the

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

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 2c7b0ac57f460920057a3ada01b10167c4601a7d..74a22fe00b36980990844db56c8b9b1177c85be4 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -1,43 +1,46 @@
 ## Makefile.am for gtk+/gdk
 
-SUBDIRS=x11 win32
+SUBDIRS=$(gdktarget)
+DIST_SUBDIRS=linux-fb nanox win32 x11
 
 EXTRA_DIST =   \
        gdkconfig.h.win32 \
        gdk.def \
-       makefile.cygwin \
+       makefile.mingw \
+       makefile.mingw.in \
        makefile.msc
 
-INCLUDES = @STRIP_BEGIN@ \
-       -DG_LOG_DOMAIN=\"Gdk\"  \
-       -I$(top_srcdir)         \
-       @GTK_DEBUG_FLAGS@       \
-       @GTK_XIM_FLAGS@         \
-       @GTK_LOCALE_FLAGS@      \
-       @GLIB_CFLAGS@           \
-       @x_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@
 
-#
-# libraries to compile and install
-#
-lib_LTLIBRARIES = libgdk.la
+INCLUDES = $(common_includes)
+gtarget=@gdktarget@
 
 # libtool stuff: set version and export symbols for resolving
-libgdkincludedir = $(includedir)/gdk
-libgdk_la_LDFLAGS = @STRIP_BEGIN@ \
-       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-       -release $(LT_RELEASE) \
-       -export-dynamic \
-       @GLIB_DEPLIBS@  \
-       @x_ldflags@     \
-       @x_libs@        \
-       -lm             \
+# since automake doesn't support conditionalized libsomething_la_LDFLAGS
+# we use the general approach here
+LDFLAGS = @STRIP_BEGIN@                                        \
+       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
+       -export-dynamic                                         \
+       -rpath @prefix@/lib                                     \
+       -L../gdk-pixbuf/.libs -lgdk_pixbuf-1.3                  \
+       @PANGO_LIBS@                                            \
+       @GLIB_DEPLIBS@                                          \
+       @more_ldflags@                                          \
+       @more_libs@                                             \
+       -lm                                                     \
 @STRIP_END@
 
-libgdk_la_LIBADD = \
-       x11/libgdk-x11.la       
-
 #
 # setup source file variables
 #
@@ -63,6 +66,8 @@ gdk_public_h_sources = @STRIP_BEGIN@ \
        gdkim.h         \
        gdkimage.h      \
        gdkinput.h      \
+       gdkpango.h      \
+       gdkpixbuf.h     \
        gdkpixmap.h     \
        gdkprivate.h    \
        gdkproperty.h   \
@@ -73,26 +78,72 @@ gdk_public_h_sources = @STRIP_BEGIN@ \
        gdkvisual.h     \
        gdkwindow.h     \
 @STRIP_END@
-gdk_c_sources = @STRIP_BEGIN@ \
-       gdk.c           \
-       gdkcolor.c      \
-       gdkdraw.c       \
-       gdkevents.c     \
-       gdkfont.c       \
-       gdkgc.c         \
-       gdkglobals.c    \
-       gdkimage.c      \
-       gdkrgb.c        \
-       gdkrectangle.c  \
-       gdkwindow.c     \
-       MwmUtil.h       \
+
+gdk_c_sources = @STRIP_BEGIN@  \
+       gdk.c                   \
+       gdkcolor.c              \
+       gdkcursor.c             \
+       gdkdraw.c               \
+       gdkevents.c             \
+       gdkfont.c               \
+       gdkgc.c                 \
+       gdkglobals.c            \
+       gdkkeyuni.c             \
+       gdkimage.c              \
+       gdkinternals.h          \
+       gdkpango.c              \
+       gdkpixbuf-drawable.c    \
+       gdkpixbuf-render.c      \
+       gdkpixmap.c             \
+       gdkpoly-generic.h       \
+       gdkpolyreg-generic.c    \
+       gdkrgb.c                \
+       gdkrectangle.c          \
+       gdkregion-generic.c     \
+       gdkregion-generic.h     \
+       gdkwindow.c             \
 @STRIP_END@
 
 #
 # setup GDK sources and their dependancies
 #
-libgdkinclude_HEADERS = $(gdk_public_h_sources)
-libgdk_la_SOURCES = $(gdk_c_sources)
+extra = @gdktargetlib@
+
+if USE_X11
+libgdk_x11_includedir = $(includedir)/gtk-2.0/gdk
+
+libgdk_x11_1_3_la_LIBADD = \
+       $(gtarget)/libgdk-$(gtarget).la 
+
+libgdk_x11_include_HEADERS = $(gdk_public_h_sources)
+libgdk_x11_1_3_la_SOURCES = $(gdk_c_sources)
+endif
+
+if USE_NANOX
+libgdk_nanox_includedir = $(includedir)/gtk-2.0/gdk
+
+libgdk_nanox_1_3_la_LIBADD = \
+       $(gtarget)/libgdk-$(gtarget).la 
+
+libgdk_nanox_include_HEADERS = $(gdk_public_h_sources)
+libgdk_nanox_1_3_la_SOURCES = $(gdk_c_sources)
+endif
+
+if USE_LINUX_FB
+libgdk_linux_fb_includedir = $(includedir)/gtk-2.0/gdk
+
+libgdk_linux_fb_1_3_la_LIBADD = \
+       $(gtarget)/libgdk-$(gtarget).la 
+
+libgdk_linux_fb_include_HEADERS = $(gdk_public_h_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-1.3.la libgdk-nanox-1.3.la libgdk-linux-fb-1.3.la
+
 MAINTAINERCLEANFILES +=
 EXTRA_HEADERS +=
 EXTRA_DIST +=
@@ -114,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)
@@ -130,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: