diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-06-26 02:29:29 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-06-26 02:29:29 -0400 |
| commit | cb29d2770714943af7b488a6a94f1f37b7466c8f (patch) | |
| tree | ba1591a9adf2ac56924a3eb3115a4bd22cc8e8d7 /gdk/Makefile.am | |
| parent | 946c1ca1367e9ada8f19bdcbcf44233235ed8bf6 (diff) | |
| download | gtk+-cb29d2770714943af7b488a6a94f1f37b7466c8f.tar.gz | |
Make GTK+ build against an external gdk-pixbuf
Diffstat (limited to 'gdk/Makefile.am')
| -rw-r--r-- | gdk/Makefile.am | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 478a5b1e8b..f7a7e3ba87 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -2,12 +2,10 @@ include $(top_srcdir)/Makefile.decl -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = \ - --add-include-path=../gdk-pixbuf +INTROSPECTION_SCANNER_ARGS = INTROSPECTION_COMPILER_ARGS = \ --includedir=$(srcdir) \ - --includedir=. \ - --includedir=../gdk-pixbuf + --includedir=. SUBDIRS = $(gdktarget) . tests DIST_SUBDIRS = win32 x11 quartz directfb tests @@ -38,7 +36,6 @@ INCLUDES = \ -DGDK_COMPILATION \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ - -I$(top_srcdir)/gdk-pixbuf \ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) @@ -171,24 +168,20 @@ common_sources = \ gdkmarshalers.c \ gdkmarshalers.h -libgdk_directfb_2_0_la_SOURCES = $(common_sources) -libgdk_directfb_2_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +libgdk_directfb_2_0_la_SOURCES = $(common_sources) +libgdk_directfb_2_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS) libgdk_directfb_2_0_la_LDFLAGS = $(LDADD) libgdk_x11_2_0_la_SOURCES = $(common_sources) -libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) libgdk_x11_2_0_la_LDFLAGS = $(LDADD) libgdk_quartz_2_0_la_SOURCES = $(common_sources) gdkkeynames.c -libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) libgdk_quartz_2_0_la_LDFLAGS = $(LDADD) libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.c -libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD) @@ -202,7 +195,7 @@ introspection_files = \ x11/*.c Gdk-2.0.gir: $(gdktargetlib) Makefile -Gdk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk --add-include-path=../gdk-pixbuf +Gdk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk Gdk_2_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 Gdk_2_0_gir_LIBS = $(gdktargetlib) Gdk_2_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files)) |