* Released 0.50

[platform/upstream/dbus.git] / glib / Makefile.am

diff --git a/glib/Makefile.am b/glib/Makefile.am
index f3b43ed..6e5c78e 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -1,63 +1,88 @@
-INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1
+SUBDIRS = . examples
 
-dbusincludedir=$(includedir)/dbus-1.0/dbus
+INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
 
 lib_LTLIBRARIES=libdbus-glib-1.la
 
-dbusinclude_HEADERS=                           \
-       dbus-glib.h                             \
-       dbus-gproxy.h
+dbus-glib-error-switch.h: $(top_srcdir)/dbus/dbus-protocol.h make-dbus-glib-error-switch.sh
+       libtool --mode=execute $(srcdir)/make-dbus-glib-error-switch.sh $(top_srcdir)/dbus/dbus-protocol.h $@
+
+BUILT_SOURCES = dbus-glib-error-switch.h
+
+CLEANFILES = $(BUILT_SOURCES)
+
+DBUS_GLIB_INTERNALS = \
+       dbus-gtype-specialized.c                \
+       dbus-gutils.c                           \
+       dbus-gutils.h                           \
+       dbus-gsignature.c                       \
+       dbus-gsignature.h                       \
+       dbus-gvalue.h                           \
+       dbus-gvalue-utils.c                     \
+       dbus-gvalue-utils.h
 
 libdbus_glib_1_la_SOURCES =                    \
+       dbus-glib-error-switch.h                \
+       dbus-glib.c                             \
        dbus-gmain.c                            \
+       dbus-gmarshal.c                         \
+       dbus-gmarshal.h                         \
        dbus-gobject.c                          \
+       dbus-gobject.h                          \
        dbus-gproxy.c                           \
        dbus-gtest.c                            \
        dbus-gtest.h                            \
-       dbus-gthread.c
+       dbus-gvalue.c                           \
+       dbus-gvalue.h                           \
+       dbus-gthread.c                          \
+       $(DBUS_GLIB_INTERNALS)
+
+libdbus_glib_HEADERS =                  \
+       dbus-gtype-specialized.h
 
-libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(top_builddir)/dbus/libdbus-1.la
+libdbus_glibdir = $(includedir)/dbus-1.0/dbus
 
-bin_PROGRAMS=dbus-glib-tool
+libdbus_glib_1_la_LIBADD= $(top_builddir)/dbus/libdbus-1.la $(DBUS_GLIB_LIBS)
+## don't export symbols that start with "_" (we use this 
+## convention for internal symbols)
+libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined
 
-dbus_glib_tool_SOURCES =                       \
+# convenience lib used here and by dbus-viewer
+noinst_LTLIBRARIES=libdbus-gtool.la
+
+libdbus_gtool_la_SOURCES = $(DBUS_GLIB_INTERNALS) \
        dbus-gidl.c                             \
        dbus-gidl.h                             \
-       dbus-glib-tool.c                        \
        dbus-gloader-expat.c                    \
        dbus-gparser.c                          \
-       dbus-gparser.h                          \
-       dbus-gtool-test.h
-
+       dbus-gparser.h
 
-dbus_glib_tool_LDADD= $(DBUS_GLIB_TOOL_LIBS) libdbus-glib-1.la $(top_builddir)/dbus/libdbus-1.la
+libdbus_gtool_la_LIBADD = libdbus-glib-1.la
 
-if DBUS_BUILD_TESTS
+bin_PROGRAMS=dbus-binding-tool
 
-if HAVE_GLIB_THREADS
-THREAD_APPS=test-thread-server test-thread-client test-profile
+dbus_binding_tool_SOURCES =                    \
+       dbus-binding-tool-glib.h                \
+       dbus-binding-tool-glib.c                \
+       dbus-glib-tool.h                        \
+       dbus-glib-tool.c
 
-test_thread_server_SOURCES=                            \
-       test-thread-server.c                            \
-       test-thread.h
+dbus_binding_tool_LDADD= libdbus-gtool.la $(DBUS_GLIB_LIBS) -lexpat
 
-test_thread_server_LDADD= $(DBUS_GLIB_THREADS_LIBS) $(top_builddir)/glib/libdbus-glib-1.la 
+## we just rebuilt these manually and check them into cvs; easier than
+## convincing automake/make to do this properly
+regenerate-built-sources:
+       @GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \
+       echo '#include "dbus-gmarshal.h"' > dbus-gmarshal.c &&                                      \
+        @GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c
 
-test_thread_client_SOURCES=                            \
-       test-thread-client.c                            \
-       test-thread.h
+EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh
 
-test_thread_client_LDADD= $(DBUS_GLIB_THREADS_LIBS) $(top_builddir)/glib/libdbus-glib-1.la 
-endif
+if DBUS_BUILD_TESTS
 
 ## 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 $(THREAD_APPS)
-
-test_dbus_glib_SOURCES=                                \
-       test-dbus-glib.c
-
-test_dbus_glib_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
+noinst_PROGRAMS= $(TESTS)
 
 ## 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 
@@ -65,7 +90,9 @@ test_dbus_glib_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
 TESTS_ENVIRONMENT=DBUS_TEST_DATA=$(top_builddir)/test/data DBUS_TEST_HOMEDIR=$(top_builddir)/dbus
 TESTS=dbus-glib-test
 
-dbus_glib_test_SOURCES=                                \
+## FIXME we aren't running dbus-glib-tool --self-test
+
+dbus_glib_test_SOURCES=                        \
        dbus-gtest-main.c
 
 dbus_glib_test_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
@@ -74,15 +101,5 @@ else
 ### not building tests
 TESTS=
 
-if HAVE_GLIB_THREADS
-noinst_PROGRAMS=test-profile
 endif
 
-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