* Released 0.50

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

diff --git a/glib/Makefile.am b/glib/Makefile.am
index b4256fa..6e5c78e 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -1,11 +1,28 @@
+SUBDIRS = . examples
+
 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
 
-libdbus_glib_HEADERS = dbus-glib-bindings.h
-libdbus_glibdir = $(includedir)/dbus-1.0/dbus
+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                         \
@@ -15,28 +32,30 @@ libdbus_glib_1_la_SOURCES =                         \
        dbus-gproxy.c                           \
        dbus-gtest.c                            \
        dbus-gtest.h                            \
-       dbus-gthread.c                          \
-       dbus-gutils.c                           \
-       dbus-gutils.h                           \
        dbus-gvalue.c                           \
-       dbus-gvalue.h
+       dbus-gvalue.h                           \
+       dbus-gthread.c                          \
+       $(DBUS_GLIB_INTERNALS)
+
+libdbus_glib_HEADERS =                  \
+       dbus-gtype-specialized.h
+
+libdbus_glibdir = $(includedir)/dbus-1.0/dbus
 
-libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(top_builddir)/dbus/libdbus-1.la
+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)
+libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined
 
 # convenience lib used here and by dbus-viewer
 noinst_LTLIBRARIES=libdbus-gtool.la
 
-libdbus_gtool_la_SOURCES =                     \
+libdbus_gtool_la_SOURCES = $(DBUS_GLIB_INTERNALS) \
        dbus-gidl.c                             \
        dbus-gidl.h                             \
        dbus-gloader-expat.c                    \
        dbus-gparser.c                          \
-       dbus-gparser.h                          \
-       dbus-gutils.c                           \
-       dbus-gutils.h
+       dbus-gparser.h
 
 libdbus_gtool_la_LIBADD = libdbus-glib-1.la
 
@@ -48,12 +67,7 @@ dbus_binding_tool_SOURCES =                  \
        dbus-glib-tool.h                        \
        dbus-glib-tool.c
 
-dbus_binding_tool_LDADD= -lexpat libdbus-gtool.la
-
-dbus-glib-bindings.h: $(top_builddir)/bus/dbus-bus-introspect.xml dbus-binding-tool
-       ./dbus-binding-tool --ignore-unsupported --mode=glib-client --output=dbus-glib-bindings.h $(top_builddir)/bus/dbus-bus-introspect.xml # FIXME - remove --ignore-unsupported when we can do arrays
-
-BUILT_SOURCES = dbus-glib-bindings.h
+dbus_binding_tool_LDADD= libdbus-gtool.la $(DBUS_GLIB_LIBS) -lexpat
 
 ## we just rebuilt these manually and check them into cvs; easier than
 ## convincing automake/make to do this properly
@@ -62,7 +76,7 @@ regenerate-built-sources:
        echo '#include "dbus-gmarshal.h"' > dbus-gmarshal.c &&                                      \
         @GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c
 
-EXTRA_DIST=dbus-gmarshal.list
+EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh
 
 if DBUS_BUILD_TESTS