Merge branches 'master' and 'master' of ssh://rootserver/home/lennart/git/public...

[catta] / avahi-gobject / Makefile.am

diff --git a/avahi-gobject/Makefile.am b/avahi-gobject/Makefile.am
index c9f442ced3dbb4ac1bc1c28758d91fee33a5264c..15d00df0a0470d6a807c77e6cef9395c375f5a33 100644 (file)
--- a/avahi-gobject/Makefile.am
+++ b/avahi-gobject/Makefile.am
@@ -23,6 +23,7 @@ AM_CFLAGS=-I$(top_srcdir)
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 if HAVE_GOBJECT
+if HAVE_DBUS
 
 avahigobjectincludedir=$(includedir)/avahi-gobject
 
@@ -30,7 +31,7 @@ avahigobjectinclude_HEADERS = \
        ga-client.h \
        ga-entry-group.h \
        ga-enums.h \
-       ga-errors.h \
+       ga-error.h \
        ga-record-browser.h \
        ga-service-browser.h \
        ga-service-resolver.h
@@ -53,7 +54,7 @@ CORE_SOURCES = \
        ga-client.c ga-client.h \
        ga-entry-group.c ga-entry-group.h \
        ga-enums.h \
-       ga-errors.c ga-errors.h \
+       ga-error.c ga-error.h \
        ga-record-browser.c ga-record-browser.h \
        ga-service-browser.c ga-service-browser.h \
        ga-service-resolver.c ga-service-resolver.h
@@ -63,8 +64,8 @@ libavahi_gobject_la_SOURCES = \
        $(BUILT_SOURCES)
 
 libavahi_gobject_la_CFLAGS = $(AM_CFLAGS) $(GOBJECT_CFLAGS)
-libavahi_gobject_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ../avahi-glib/libavahi-glib.la $(GOJECT_LIBS)
-libavahi_gobject_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_GOBJECT_VERSION_INFO)
+libavahi_gobject_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ../avahi-glib/libavahi-glib.la $(GOBJECT_LIBS)
+libavahi_gobject_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_GOBJECT_VERSION_INFO) -export-symbols-regex '^ga_'
 
 # correctly clean the generated source files
 CLEANFILES = $(BUILT_SOURCES)
@@ -74,7 +75,7 @@ dist-hook:
 
 signals-marshal.list: $(CORE_SOURCES) Makefile.am
        ( cd $(srcdir) && \
-       sed -n -e 's/.*ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
+       sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
                $(CORE_SOURCES) ) \
                | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
        if cmp -s $@.tmp $@; then \
@@ -84,10 +85,10 @@ signals-marshal.list: $(CORE_SOURCES) Makefile.am
        fi
 
 signals-marshal.h: signals-marshal.list
-       glib-genmarshal --header --prefix=ga_signals_marshal $< > $@
+       glib-genmarshal --header --prefix=_ga_signals_marshal $< > $@
 
 signals-marshal.c: signals-marshal.list
-       glib-genmarshal --body --prefix=ga_signals_marshal $< > $@
+       glib-genmarshal --body --prefix=_ga_signals_marshal $< > $@
 
 
 # rules for making the glib enum objects
@@ -109,6 +110,7 @@ signals-marshal.c: signals-marshal.list
        $< > $@
 
 endif
+endif
 
 indent:
        indent -brf -nbbo -nbc -ip0 -cs -nbfde -npsl -br -brs -bap -i4 -bs -cdw -ce -npcs -hnl -cli4 -nut -ci8 ga-*.[ch]