split off libavahi-gobject into its own directory

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1564 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

17 files changed, 118 insertions, 91 deletions

diff --git a/Makefile.am b/Makefile.am
index b1e47d0..23888b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,6 +59,7 @@ SUBDIRS = \
 	avahi-qt \
 	avahi-client \
 	avahi-glib \
+	avahi-gobject \
 	avahi-discover-standalone \
 	avahi-daemon \
 	avahi-sharp \
diff --git a/avahi-glib/Makefile.am b/avahi-glib/Makefile.am
index 7931bd9..f0be870 100644
--- a/avahi-glib/Makefile.am
+++ b/avahi-glib/Makefile.am
@@ -24,9 +24,9 @@ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 if HAVE_GLIB
 
-avahiincludedir=$(includedir)/avahi-glib
+avahiglibincludedir=$(includedir)/avahi-glib
 
-avahiinclude_HEADERS = \
+avahiglibinclude_HEADERS = \
 	glib-watch.h \
 	glib-malloc.h
 
@@ -52,93 +52,4 @@ glib_watch_test_SOURCES = \
 glib_watch_test_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
 glib_watch_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(GLIB20_LIBS)
 
-if HAVE_GOBJECT
-
-avahiinclude_HEADERS += \
-	ga-client.h \
-	ga-entry-group.h \
-	ga-enums.h \
-	ga-errors.h \
-	ga-record-browser.h \
-	ga-service-browser.h \
-	ga-service-resolver.h
-
-lib_LTLIBRARIES += \
-	libavahi-gobject.la
-
-BUILT_SOURCES = \
-	signals-marshal.list \
-	signals-marshal.h \
-	signals-marshal.c \
-	ga-client-enumtypes.h \
-	ga-client-enumtypes.c  \
-	ga-entry-group-enumtypes.h \
-	ga-entry-group-enumtypes.c  \
-	ga-enums-enumtypes.h \
-	ga-enums-enumtypes.c
-
-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-record-browser.c ga-record-browser.h \
-	ga-service-browser.c ga-service-browser.h \
-	ga-service-resolver.c ga-service-resolver.h
-
-libavahi_gobject_la_SOURCES = \
-	$(CORE_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 libavahi-glib.la $(GOJECT_LIBS)
-libavahi_gobject_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_GOBJECT_VERSION_INFO)
-
-# correctly clean the generated source files
-CLEANFILES = $(BUILT_SOURCES)
-
-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' \
-		$(CORE_SOURCES) ) \
-		| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
-	if cmp -s $@.tmp $@; then \
-		rm $@.tmp; \
-	else \
-		mv $@.tmp $@; \
-	fi
-
-signals-marshal.h: signals-marshal.list
-	glib-genmarshal --header --prefix=ga_signals_marshal $< > $@
-
-signals-marshal.c: signals-marshal.list
-	glib-genmarshal --body --prefix=ga_signals_marshal $< > $@
-
-
-# rules for making the glib enum objects
-%-enumtypes.h: %.h Makefile.in
-	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"         \
-	--ftail "G_END_DECLS\n\n#endif /* __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__ */" \
-	$< > $@
-
-%-enumtypes.c: %.h Makefile.in
-	glib-mkenums \
-	--fhead "#include <$*.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@\" }," \
-	--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-	$< > $@
-
-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]
diff --git a/avahi-gobject/Makefile.am b/avahi-gobject/Makefile.am
new file mode 100644
index 0000000..c9f442c
--- /dev/null
+++ b/avahi-gobject/Makefile.am
@@ -0,0 +1,114 @@
+# $Id$
+#
+# This file is part of avahi.
+#
+# avahi is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# avahi is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with avahi; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+
+AM_CFLAGS=-I$(top_srcdir)
+
+# This cool debug trap works on i386/gcc only
+AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
+
+if HAVE_GOBJECT
+
+avahigobjectincludedir=$(includedir)/avahi-gobject
+
+avahigobjectinclude_HEADERS = \
+	ga-client.h \
+	ga-entry-group.h \
+	ga-enums.h \
+	ga-errors.h \
+	ga-record-browser.h \
+	ga-service-browser.h \
+	ga-service-resolver.h
+
+lib_LTLIBRARIES = \
+	libavahi-gobject.la
+
+BUILT_SOURCES = \
+	signals-marshal.list \
+	signals-marshal.h \
+	signals-marshal.c \
+	ga-client-enumtypes.h \
+	ga-client-enumtypes.c  \
+	ga-entry-group-enumtypes.h \
+	ga-entry-group-enumtypes.c  \
+	ga-enums-enumtypes.h \
+	ga-enums-enumtypes.c
+
+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-record-browser.c ga-record-browser.h \
+	ga-service-browser.c ga-service-browser.h \
+	ga-service-resolver.c ga-service-resolver.h
+
+libavahi_gobject_la_SOURCES = \
+	$(CORE_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)
+
+# correctly clean the generated source files
+CLEANFILES = $(BUILT_SOURCES)
+
+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' \
+		$(CORE_SOURCES) ) \
+		| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
+	if cmp -s $@.tmp $@; then \
+		rm $@.tmp; \
+	else \
+		mv $@.tmp $@; \
+	fi
+
+signals-marshal.h: signals-marshal.list
+	glib-genmarshal --header --prefix=ga_signals_marshal $< > $@
+
+signals-marshal.c: signals-marshal.list
+	glib-genmarshal --body --prefix=ga_signals_marshal $< > $@
+
+
+# rules for making the glib enum objects
+%-enumtypes.h: %.h Makefile.in
+	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"         \
+	--ftail "G_END_DECLS\n\n#endif /* __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__ */" \
+	$< > $@
+
+%-enumtypes.c: %.h Makefile.in
+	glib-mkenums \
+	--fhead "#include <$*.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@\" }," \
+	--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+	$< > $@
+
+endif
+
+indent:
+	indent -brf -nbbo -nbc -ip0 -cs -nbfde -npsl -br -brs -bap -i4 -bs -cdw -ce -npcs -hnl -cli4 -nut -ci8 ga-*.[ch]
diff --git a/avahi-glib/ga-client.c b/avahi-gobject/ga-client.c
index d34933f..d34933f 100644
--- a/avahi-glib/ga-client.c
+++ b/avahi-gobject/ga-client.c
diff --git a/avahi-glib/ga-client.h b/avahi-gobject/ga-client.h
index 7776d41..7776d41 100644
--- a/avahi-glib/ga-client.h
+++ b/avahi-gobject/ga-client.h
diff --git a/avahi-glib/ga-entry-group.c b/avahi-gobject/ga-entry-group.c
index 9b79e83..9b79e83 100644
--- a/avahi-glib/ga-entry-group.c
+++ b/avahi-gobject/ga-entry-group.c
diff --git a/avahi-glib/ga-entry-group.h b/avahi-gobject/ga-entry-group.h
index 5d2f6ba..5d2f6ba 100644
--- a/avahi-glib/ga-entry-group.h
+++ b/avahi-gobject/ga-entry-group.h
diff --git a/avahi-glib/ga-enums.h b/avahi-gobject/ga-enums.h
index 9298686..9298686 100644
--- a/avahi-glib/ga-enums.h
+++ b/avahi-gobject/ga-enums.h
diff --git a/avahi-glib/ga-errors.c b/avahi-gobject/ga-errors.c
index 5abe36a..5abe36a 100644
--- a/avahi-glib/ga-errors.c
+++ b/avahi-gobject/ga-errors.c
diff --git a/avahi-glib/ga-errors.h b/avahi-gobject/ga-errors.h
index 9ed10e0..9ed10e0 100644
--- a/avahi-glib/ga-errors.h
+++ b/avahi-gobject/ga-errors.h
diff --git a/avahi-glib/ga-record-browser.c b/avahi-gobject/ga-record-browser.c
index f6747cd..f6747cd 100644
--- a/avahi-glib/ga-record-browser.c
+++ b/avahi-gobject/ga-record-browser.c
diff --git a/avahi-glib/ga-record-browser.h b/avahi-gobject/ga-record-browser.h
index c27c061..c27c061 100644
--- a/avahi-glib/ga-record-browser.h
+++ b/avahi-gobject/ga-record-browser.h
diff --git a/avahi-glib/ga-service-browser.c b/avahi-gobject/ga-service-browser.c
index f694ca5..f694ca5 100644
--- a/avahi-glib/ga-service-browser.c
+++ b/avahi-gobject/ga-service-browser.c
diff --git a/avahi-glib/ga-service-browser.h b/avahi-gobject/ga-service-browser.h
index c610dbe..c610dbe 100644
--- a/avahi-glib/ga-service-browser.h
+++ b/avahi-gobject/ga-service-browser.h
diff --git a/avahi-glib/ga-service-resolver.c b/avahi-gobject/ga-service-resolver.c
index 380e0a5..380e0a5 100644
--- a/avahi-glib/ga-service-resolver.c
+++ b/avahi-gobject/ga-service-resolver.c
diff --git a/avahi-glib/ga-service-resolver.h b/avahi-gobject/ga-service-resolver.h
index b01f524..b01f524 100644
--- a/avahi-glib/ga-service-resolver.h
+++ b/avahi-gobject/ga-service-resolver.h
diff --git a/configure.ac b/configure.ac
index 7aca721..43b1f65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1000,6 +1000,7 @@ Makefile
 avahi-common/Makefile
 avahi-core/Makefile
 avahi-glib/Makefile
+avahi-gobject/Makefile
 avahi-qt/Makefile
 avahi-daemon/Makefile
 avahi-daemon/avahi-dbus.conf