get rid of a lot of old svn cruft

[catta] / avahi-gobject / Makefile.am

diff --git a/avahi-gobject/Makefile.am b/avahi-gobject/Makefile.am
index a9bcd4bc7bf70ef1603e3b2baaad81fd13747dd4..bfb339356a0bb0edbf6cc5c5ab76c56621189cc4 100644 (file)
--- a/avahi-gobject/Makefile.am
+++ b/avahi-gobject/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-#
 # This file is part of avahi.
 #
 # avahi is free software; you can redistribute it and/or modify it
@@ -65,7 +63,7 @@ libavahi_gobject_la_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 $(GOBJECT_LIBS)
-libavahi_gobject_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_GOBJECT_VERSION_INFO)
+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,10 +72,10 @@ dist-hook:
        $(shell for x in $(BUILT_SOURCES); do rm -f $(distdir)/$$x ; done)
 
 signals-marshal.list: $(CORE_SOURCES) Makefile.am
-       ( cd $(srcdir) && \
-       sed -n -e 's/.*ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
+       $(AM_V_GEN)( cd $(srcdir) && \
+       sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
                $(CORE_SOURCES) ) \
-               | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
+               | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp && \
        if cmp -s $@.tmp $@; then \
                rm $@.tmp; \
        else \
@@ -85,15 +83,15 @@ signals-marshal.list: $(CORE_SOURCES) Makefile.am
        fi
 
 signals-marshal.h: signals-marshal.list
-       glib-genmarshal --header --prefix=ga_signals_marshal $< > $@
+       $(AM_V_GEN)glib-genmarshal --header --prefix=_ga_signals_marshal $< > $@
 
 signals-marshal.c: signals-marshal.list
-       glib-genmarshal --body --prefix=ga_signals_marshal $< > $@
+       $(AM_V_GEN)(echo "#include \"signals-marshal.h\"" ; glib-genmarshal --body --prefix=_ga_signals_marshal $< ) > $@
 
 
 # rules for making the glib enum objects
 %-enumtypes.h: %.h Makefile.in
-       glib-mkenums \
+       $(AM_V_GEN)glib-mkenums \
        --fhead "#ifndef __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
        --fprod "/* enumerations from \"@filename@\" */\n" \
        --vhead "GType @enum_name@_get_type (void);\n#define $(shell echo $* | tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
@@ -101,8 +99,8 @@ signals-marshal.c: signals-marshal.list
        $< > $@
 
 %-enumtypes.c: %.h Makefile.in
-       glib-mkenums \
-       --fhead "#include <$*.h>" \
+       $(AM_V_GEN)glib-mkenums \
+       --fhead "#include <$*.h>\n#include<$*-enumtypes.h>" \
        --fprod "\n/* enumerations from \"@filename@\" */" \
        --vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"     \
        --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@VALUENAME@\" }," \