diff options
Diffstat (limited to 'glib/Makefile.am')
| -rw-r--r-- | glib/Makefile.am | 70 |
1 files changed, 42 insertions, 28 deletions
diff --git a/glib/Makefile.am b/glib/Makefile.am index ebdb932f..a45aa593 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) +INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 dbusincludedir=$(includedir)/dbus-1.0/dbus @@ -9,47 +9,61 @@ dbusinclude_HEADERS= \ libdbus_glib_1_la_SOURCES = \ dbus-gmain.c \ - dbus-gthread.c + dbus-gobject.c \ + dbus-gproxy.c \ + dbus-gtest.c \ + dbus-gtest.h \ + dbus-gthread.c \ + dbus-gutils.c \ + dbus-gutils.h libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(top_builddir)/dbus/libdbus-1.la +## don't export symbols that start with "_" (we use this +## convention for internal symbols) +libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -if DBUS_BUILD_TESTS +# convenience lib used here and by dbus-viewer +noinst_LTLIBRARIES=libdbus-gtool.la -if HAVE_GLIB_THREADS -THREAD_APPS=test-thread-server test-thread-client test-profile +libdbus_gtool_la_SOURCES = \ + dbus-gidl.c \ + dbus-gidl.h \ + dbus-gloader-expat.c \ + dbus-gparser.c \ + dbus-gparser.h \ + dbus-gutils.c \ + dbus-gutils.h -test_thread_server_SOURCES= \ - test-thread-server.c \ - test-thread.h +libdbus_gtool_la_LIBADD = libdbus-glib-1.la -test_thread_server_LDADD= $(DBUS_GLIB_THREADS_LIBS) $(top_builddir)/glib/libdbus-glib-1.la +bin_PROGRAMS=dbus-glib-tool -test_thread_client_SOURCES= \ - test-thread-client.c \ - test-thread.h +dbus_glib_tool_SOURCES = \ + dbus-glib-tool.c \ + dbus-gtool-test.h -test_thread_client_LDADD= $(DBUS_GLIB_THREADS_LIBS) $(top_builddir)/glib/libdbus-glib-1.la -endif +dbus_glib_tool_LDADD= $(DBUS_GLIB_TOOL_LIBS) libdbus-gtool.la + +if DBUS_BUILD_TESTS -noinst_PROGRAMS= test-dbus-glib $(THREAD_APPS) +## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we +## build even when not doing "make check" +noinst_PROGRAMS= $(TESTS) -test_dbus_glib_SOURCES= \ - test-dbus-glib.c +## note that TESTS has special meaning (stuff to use in make check) +## so if adding tests not to be run in make check, don't add them to +## TESTS +TESTS_ENVIRONMENT=DBUS_TEST_DATA=$(top_builddir)/test/data DBUS_TEST_HOMEDIR=$(top_builddir)/dbus +TESTS=dbus-glib-test -test_dbus_glib_LDADD= $(top_builddir)/glib/libdbus-glib-1.la +dbus_glib_test_SOURCES= \ + dbus-gtest-main.c + +dbus_glib_test_LDADD= $(top_builddir)/glib/libdbus-glib-1.la else ### not building tests - -if HAVE_GLIB_THREADS -noinst_PROGRAMS=test-profile -endif +TESTS= endif -if HAVE_GLIB_THREADS -test_profile_SOURCES= \ - test-profile.c - -test_profile_LDADD= $(DBUS_GLIB_THREADS_LIBS) $(top_builddir)/glib/libdbus-glib-1.la -endif
\ No newline at end of file |