diff options
| author | Jannis Pohlmann <jannis@xfce.org> | 2010-12-04 13:36:58 +0100 |
|---|---|---|
| committer | Jannis Pohlmann <jannis@xfce.org> | 2010-12-04 13:36:58 +0100 |
| commit | 0f7034bbc0032d62dff25c1fa0d02b8b769e37c8 (patch) | |
| tree | 3dc8e8dd17dcd2834c1eda9dd4fb9c616e27a4ea | |
| parent | ab3d16ac5fb3870d51e1217183a46183427bb218 (diff) | |
| download | garcon-0f7034bbc0032d62dff25c1fa0d02b8b769e37c8.tar.gz | |
Explicitly link against gobject, add other missing libs (bug #6405).
| -rw-r--r-- | configure.in.in | 1 | ||||
| -rw-r--r-- | docs/reference/Makefile.am | 6 | ||||
| -rw-r--r-- | garcon/Makefile.am | 8 | ||||
| -rw-r--r-- | tests/Makefile.am | 12 |
4 files changed, 21 insertions, 6 deletions
diff --git a/configure.in.in b/configure.in.in index 7b9092e..139a91e 100644 --- a/configure.in.in +++ b/configure.in.in @@ -112,6 +112,7 @@ dnl *** Check for required packages *** dnl *********************************** XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.14.0]) XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.14.0]) +XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.14.0]) XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.14.0]) dnl ************************* diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 2cb0e91..1decf21 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -58,13 +58,17 @@ content_files = \ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ + $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ + $(GOBJECT_CFLAGS) \ $(GTHREAD_CFLAGS) \ $(GTK_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) GTKDOC_LIBS = \ - $(GLIB_CFLAGS) \ + $(GIO_LIBS) \ + $(GLIB_LIBS) \ + $(GOBJECT_LIBS) \ $(GTHREAD_LIBS) \ $(GTK_CFLAGS) \ $(LIBXFCE4UTIL_LIBS) \ diff --git a/garcon/Makefile.am b/garcon/Makefile.am index 3ae2c35..b524b38 100644 --- a/garcon/Makefile.am +++ b/garcon/Makefile.am @@ -79,9 +79,10 @@ libgarcon_1_la_SOURCES = \ $(libgarcon_headers) libgarcon_1_la_CFLAGS = \ + $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ + $(GOBJECT_CFLAGS) \ $(GTHREAD_CFLAGS) \ - $(GIO_CFLAGS) \ $(PLATFORM_CFLAGS) libgarcon_1_la_LDFLAGS = \ @@ -92,9 +93,10 @@ libgarcon_1_la_LDFLAGS = \ $(PLATFORM_LDFLAGS) libgarcon_1_la_LIBADD = \ + $(GIO_LIBS) \ $(GLIB_LIBS) \ - $(GTHREAD_LIBS) \ - $(GIO_LIBS) + $(GOBJECT_LIBS) \ + $(GTHREAD_LIBS) EXTRA_DIST = \ garcon-config.h.in \ diff --git a/tests/Makefile.am b/tests/Makefile.am index ec22c5a..e399e80 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -30,14 +30,18 @@ test_menu_parser_SOURCES = \ test_menu_parser_CFLAGS = \ $(LIBXFCE4UTIL_CFLAGS) \ - $(GLIB_CFLAGS) + $(GIO_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GOBJECT_CFLAGS) test_menu_parser_DEPENDENCIES = \ $(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la test_menu_parser_LDADD = \ $(LIBXFCE4UTIL_LIBS) \ + $(GIO_LIBS) \ $(GLIB_LIBS) \ + $(GOBJECT_LIBS) \ $(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la test_menu_spec_SOURCES = \ @@ -45,14 +49,18 @@ test_menu_spec_SOURCES = \ test_menu_spec_CFLAGS = \ $(LIBXFCE4UTIL_CFLAGS) \ - $(GLIB_CFLAGS) + $(GIO_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GOBJECT_CFLAGS) test_menu_spec_DEPENDENCIES = \ $(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la test_menu_spec_LDADD = \ $(LIBXFCE4UTIL_LIBS) \ + $(GIO_LIBS) \ $(GLIB_LIBS) \ + $(GOBJECT_LIBS) \ $(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la EXTRA_DIST = \ |