GNOME.org
 

[libsoup] Use Makefile.glib

commit 4dc4c05536ddda37e702966c87dfbe8acf120f40
Author: Dan Winship <danw gnome org>
Date:   Fri Jun 3 18:29:59 2011 -0400

    Use Makefile.glib
    
    Test drive Makefile.glib from bug 654395 (excepted distributed with
    the tarball rather than using one installed with glib).

 .gitignore                     |    6 +-
 Makefile.am                    |    3 +-
 Makefile.glib                  |  302 ++++++++++++++++++++++++++++++++++++++++
 configure.ac                   |    3 +
 libsoup/Makefile.am            |   51 ++-----
 libsoup/soup-auth-manager.c    |    2 +-
 libsoup/soup-auth.c            |    2 +-
 libsoup/soup-connection.c      |    2 +-
 libsoup/soup-cookie-jar.c      |    2 +-
 libsoup/soup-enum-types.c.tmpl |   36 -----
 libsoup/soup-enum-types.h.tmpl |   24 ---
 libsoup/soup-marshal.list      |   10 --
 libsoup/soup-message.c         |   24 ++--
 libsoup/soup-server.c          |    8 +-
 libsoup/soup-session.c         |   12 +-
 libsoup/soup-socket.c          |    8 +-
 16 files changed, 354 insertions(+), 141 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1517abd..8d77197 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,10 +41,8 @@ install-sh
 libsoup-zip
 libsoup-2.4.pc
 libsoup-gnome-2.4.pc
-libsoup/soup-enum-types.c
-libsoup/soup-enum-types.h
-libsoup/soup-marshal.c
-libsoup/soup-marshal.h
+libsoup/soup-enum-types.*
+libsoup/soup-marshal.*
 libsoup/Soup-2.4.gir
 libsoup/Soup-2.4.typelib
 libsoup/SoupGNOME-2.4.gir
diff --git a/Makefile.am b/Makefile.am
index bb94238..8b86fb7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,8 @@ EXTRA_DIST =			\
 	libsoup-gnome-2.4.pc.in	\
 	gtk-doc.make		\
 	libsoup-zip.in		\
-	m4/introspection.m4
+	m4/introspection.m4	\
+	Makefile.glib
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
 
diff --git a/Makefile.glib b/Makefile.glib
new file mode 100644
index 0000000..a8cf3b9
--- /dev/null
+++ b/Makefile.glib
@@ -0,0 +1,302 @@
+# -*- Mode: makefile -*-
+#
+# To use:
+#
+# In configure.ac:
+#   add -Wno-portability to AM_INIT_AUTOMAKE
+#   add GLIB_CONFIG([min-version[, required-modules]])
+#   (remove AM_PATH_GLIB_2_0 and GLIB_GSETTINGS)
+#
+# Add to Makefile.am where your library/program is built:
+#   include $(GLIB_MAKEFILE)
+#
+#   BUILT_SOURCES = $(GLIB_GENERATED)
+#
+# Add *.stamp to .gitignore
+#
+# Add a GLIB_GENERATED variable with the files you want to generate,
+# as described below. (The examples below use filenames with hyphens,
+# eg foo-marshal.h, but you can omit the hyphens if that matches your
+# file naming scheme better.)
+#
+# You do not need to modify CLEANFILES or EXTRA_DIST for any of these
+# macros.
+
+
+# glib-genmarshal
+#
+# To generate signal marshallers, add files with names ending in
+# "marshal.h" and "marshal.c" to GLIB_GENERATED:
+#
+#    GLIB_GENERATED += foo-marshal.h foo-marshal.c
+#    foo_marshal_sources = aaa.c bbb.c ccc.c ddd.c
+#
+# Makefile.glib will then generate a foo-marshal.list file containing
+# all _foo_marshal_* functions referenced by $(foo_marshal_sources),
+# and will rebuild foo-marshal.c/foo-marshal.h whenever the list
+# changes.
+#
+# For your convenience, any .h files or $(GLIB_GENERATED) files in
+# $(foo_marshal_sources) will be ignored. This means you can usually just
+# set foo_marshal_sources to the value of your library/program's
+# _SOURCES variable, even if that variable contains foo-marshal.c.
+#
+# You can set GLIB_GENMARSHAL_H_FLAGS and GLIB_GENMARSHAL_C_FLAGS (or
+# an appropriate file-specific variable, eg
+# foo_marshal_GENMARSHAL_H_FLAGS) to set/override glib-genmarshal
+# options.
+
+
+# glib-mkenums
+#
+# To generate enum type registrations, add files with names ending
+# in "-enum-types.[ch]" or "enumtypes.[ch]" to GLIB_GENERATED:
+#
+#    GLIB_GENERATED += foo-enum-types.h foo-enum-types.c
+#    foo_enum_types_sources = aaa.h bbb.h ccc.h ddd.h
+#
+# Makefile.glib will create a list all of the enum/flags types
+# declared in $(foo_enum_type_sources), and will rebuild
+# foo-enum-types.c/foo-enum-types.h whenever that list changes. (No
+# template files are required.)
+#
+# For your convenience, any .c files or $(GLIB_GENERATED) files in
+# $(foo_enum_types_sources) will be ignored. This means you can
+# usually set foo_enum_types_sources to the value of your
+# library/program's _HEADERS and/or _SOURCES variables, even if that
+# contains foo-enum-types.h.
+#
+# You can set GLIB_MKENUMS_H_FLAGS and GLIB_MKENUMS_C_FLAGS (or an
+# appropriate file-specific variable, eg
+# foo_enum_types_MKENUMS_H_FLAGS) to set/override glib-mkenums
+# options. In particular, you can do:
+#
+#     GLIB_MKENUMS_C_FLAGS = --fhead "\#define FOO_I_KNOW_THIS_IS_UNSTABLE"
+#
+# (The backslash is necessary to keep make from thinking the "#" is
+# the start of a comment.)
+
+
+# glib-compile-schemas
+#
+# Any foo.gschemas.xml files listed in gsettingsschema_DATA will be
+# validated before installation, and (if --disable-schemas-compile was
+# not passed) compiled after installation.
+#
+# To build an enums file, add it to GLIB_GENERATED (in addition to
+# gsettingsschema_DATA):
+#
+#     GLIB_GENERATED += org.gnome.foo.enums.xml
+#     org_gnome_foo_enums_xml_sources = aaa.h bbb.h ccc.h ddd.h
+#
+# All enums files will be built before any schema files are validated.
+
+
+########
+
+# Notes on Makefile.glib hacking:
+#
+#   - The exact rules that automake generates for a Makefile vary
+#     depending on what sorts of things were done in the Makefile.am,
+#     so we have to be careful with what rules we assume are there.
+#     In particular, (a) the glue to handle BUILT_SOURCES and the
+#     various hooks won't be output unless those things were
+#     referenced in the Makefile.am, and (b) a Makefile.am with
+#     SUBDIRS will get different rules than one without.
+#
+#   - Build rules should always refer to their dependencies via $^,
+#     not by reusing a variable that is listed in the rule's
+#     dependencies. This is needed to make srcdir!=builddir builds
+#     work. You can use $(filter)/$(filter-out) if $^ has things
+#     you don't want in it.
+#
+#   - When using a filename as something other than a filename,
+#     consider whether you need to wrap it in $(notdir) to get the
+#     right result when that file is being pulled out of a
+#     subdirectory.
+#
+#   - All private variables should be prefixed with _glib or _GLIB
+#
+#   - "make -qp > makefile.out" will give you a copy of the
+#     Makefile after all macros are expanded.
+#
+# The genmarshal code is commented; the mkenums and schema code is
+# generally similar.
+
+_GLIB_CLEANFILES =
+_GLIB_DISTCLEANFILES =
+
+_GLIB_V_GEN = $(_glib_v_gen_$(V))
+_glib_v_gen_ = $(_glib_v_gen_$(AM_DEFAULT_VERBOSITY))
+_glib_v_gen_0 = @echo "  GEN   " $(subst .stamp,,$@);
+
+
+### glib-genmarshal
+
+# _GLIB_MARSHAL_GENERATED contains the basenames (eg, "foo-marshal")
+# of all the marshal-related files to be generated.
+_GLIB_MARSHAL_GENERATED = $(subst .h,,$(filter %marshal.h,$(GLIB_GENERATED)))
+
+# These are used as macros (with the value of $(1) inherited from the "caller")
+#   _glib_marshal_prefix("foo-marshal") = "foo" (used in the C marshal names)
+#   _glib_marshal_sources_var("foo-marshal") = "foo_marshal_sources"
+#   _glib_marshal_sources = the filtered value of $(foo_marshal_sources)
+_glib_marshal_prefix = $(subst marshal,,$(subst _marshal,,$(subst -,_,$(notdir $(1)))))_marshal
+_glib_marshal_sources_var = $(subst -,_,$(notdir $(1)))_sources
+_glib_marshal_sources = $(filter-out %.h,$(filter-out $(GLIB_GENERATED),$($(_glib_marshal_sources_var))))
+
+# This is a multi-line macro (ending with the "endef" below) that
+# outputs a set of rules for a single .h/.c pair (whose basename is
+# $(1)). The initial $(if) line makes make error out if
+# foo_marshal_sources wasn't set. Note that single-$ variables are
+# expanded when the macro is called, and double-$ variables are
+# expanded when the rule is invoked.
+define _glib_make_genmarshal_rules =
+$(if $(_glib_marshal_sources),,$(error Need to define $(_glib_marshal_sources_var) for $(1).[ch]))
+
+$(1).list.stamp: $(_glib_marshal_sources)
+	$$(_GLIB_V_GEN) sed -ne 's/.*_$(_glib_marshal_prefix)_\([_A-Z]*\).*/\1/p' $$^ | sort -u | sed -e 's/__/:/' -e 's/_/,/g' > $(1).list.tmp && \
+	(cmp -s $(1).list.tmp $(1).list || cp $(1).list.tmp $(1).list) && \
+	rm -f $(1).list.tmp && \
+	echo timestamp > $$@
+
+$(1).list: $(1).list.stamp
+	@true
+
+$(1).h: $(1).list
+	$$(_GLIB_V_GEN) $$(GLIB_GENMARSHAL) \
+		--prefix=_$(_glib_marshal_prefix) --header \
+		$$(GLIB_GENMARSHAL_H_FLAGS) \
+		$$($(_glib_marshal_prefix)_GENMARSHAL_H_FLAGS) \
+		$$< > $$  tmp && \
+	mv $$  tmp $$@
+
+$(1).c: $(1).list
+	$$(_GLIB_V_GEN) (echo "#include \"$$(subst .c,.h,$$(@F))\""; $$(GLIB_GENMARSHAL) \
+		--prefix=_$(_glib_marshal_prefix) --body \
+		$$(GLIB_GENMARSHAL_C_FLAGS) \
+		$$($(_glib_marshal_prefix)_GENMARSHAL_C_FLAGS) \
+		$$< ) > $$  tmp && \
+	mv $$  tmp $$@
+
+_GLIB_CLEANFILES += $(1).list.stamp $(1).list
+_GLIB_DISTCLEANFILES += $(1).h $(1).c
+endef
+
+# Run _glib_make_genmarshal_rules for each set of generated files
+$(foreach f,$(_GLIB_MARSHAL_GENERATED),$(eval $(call _glib_make_genmarshal_rules,$f)))
+
+
+### glib-mkenums
+
+_GLIB_ENUM_TYPES_GENERATED = $(subst .h,,$(filter %enum-types.h %enumtypes.h,$(GLIB_GENERATED)))
+
+_glib_enum_types_prefix = $(subst -,_,$(notdir $(1)))
+_glib_enum_types_guard = __$(shell echo $(_glib_enum_types_prefix) | tr 'a-z' 'A-Z')_H__
+_glib_enum_types_sources_var = $(_glib_enum_types_prefix)_sources
+_glib_enum_types_sources = $(filter-out $(GLIB_GENERATED),$($(_glib_enum_types_sources_var)))
+_glib_enum_types_h_sources = $(filter %.h,$(_glib_enum_types_sources))
+
+define _glib_make_mkenums_rules =
+$(if $(_glib_enum_types_sources),,$(error Need to define $(_glib_enum_types_sources_var) for $(1).[ch]))
+
+$(1).h.stamp: $(_glib_enum_types_h_sources)
+	$$(_GLIB_V_GEN) $$(GLIB_MKENUMS) \
+		--fhead "/* Generated by glib-mkenums. Do not edit */\n\n#ifndef $(_glib_enum_types_guard)\n#define $(_glib_enum_types_guard)\n\n" \
+		$$(GLIB_MKENUMS_H_FLAGS) \
+		$$($(_glib_enum_types_prefix)_MKENUMS_H_FLAGS) \
+		--fhead "#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+		--vhead "GType @enum_name _get_type (void) G_GNUC_CONST;\n#define @ENUMPREFIX _TYPE_@ENUMSHORT@ (@enum_name _get_type ())\n" \
+		--ftail "G_END_DECLS\n\n#endif /* $(_glib_enum_types_guard) */" \
+		$$^ > $(1).h.tmp && \
+	(cmp -s $(1).h.tmp $(1).h || cp $(1).h.tmp $(1).h) && \
+	rm -f $(1).h.tmp && \
+	echo timestamp > $$@
+
+$(1).h: $(1).h.stamp
+	@true
+
+$(1).c.stamp: $(_glib_enum_types_h_sources)
+	$$(_GLIB_V_GEN) $$(GLIB_MKENUMS) \
+		--fhead "/* Generated by glib-mkenums. Do not edit */\n\n#include \"$(notdir $(1)).h\"\n" \
+		$$(GLIB_MKENUMS_C_FLAGS) \
+		$$($(_glib_enum_types_prefix)_MKENUMS_C_FLAGS) \
+		--fhead "$$(foreach f,$$(^F),\n#include \"$$(f)\")\n\n" \
+		--vhead "GType\n enum_name@_get_type (void)\n{\n  static volatile gsize g_define_type_id__volatile = 0;\n\n  if (g_once_init_enter (&g_define_type_id__volatile))\n    {\n      static const G Type@Value values[] = {\n" \
+		--vprod "        { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" },\n" \
+		--vtail "        { 0, NULL, NULL }\n      };\n      GType g_define_type_id =\n        g_ type@_register_static (g_intern_static_string (\"@EnumName \"), values);\n      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);\n    }\n\n  return g_define_type_id__volatile;\n}\n" \
+		$$^ > $(1).c.tmp && \
+	(cmp -s $(1).c.tmp $(1).c || cp $(1).c.tmp $(1).c) && \
+	rm -f $(1).c.tmp && \
+	echo timestamp > $$@
+
+$(1).c: $(1).c.stamp
+	@true
+
+_GLIB_CLEANFILES += $(1).h.stamp $(1).c.stamp
+_GLIB_DISTCLEANFILES += $(1).h $(1).c $(1).h.stamp $(1).c.stamp
+endef
+
+$(foreach f,$(_GLIB_ENUM_TYPES_GENERATED),$(eval $(call _glib_make_mkenums_rules,$f)))
+
+
+### glib-compile-schemas
+
+_GLIB_ENUMS_XML_GENERATED = $(filter %.enums.xml,$(GLIB_GENERATED))
+_GLIB_GSETTINGS_SCHEMA_FILES = $(filter %.gschema.xml,$(gsettingsschema_DATA))
+_GLIB_GSETTINGS_VALID_FILES = $(subst .xml,.valid,$(_GLIB_GSETTINGS_SCHEMA_FILES))
+
+_glib_enums_xml_prefix = $(subst .,_,$(notdir $(1)))
+_glib_enums_xml_sources_var = $(_glib_enums_xml_prefix)_sources
+_glib_enums_xml_sources = $(filter-out $(GLIB_GENERATED),$($(_glib_enums_xml_sources_var)))
+_glib_enums_xml_namespace = $(subst .enums.xml,,$(notdir $(1)))
+
+define _glib_make_enums_xml_rule
+$(if $(_glib_enums_xml_sources),,$(error Need to define $(_glib_enums_xml_sources_var) for $(1)))
+
+$(1): $(_glib_enums_xml_sources)
+	$$(_GLIB_V_GEN) $$(GLIB_MKENUMS) --comments '<!-- @comment@ -->' --fhead "<schemalist>" --vhead "  <@type@ id='$(_glib_enums_xml_namespace)  EnumName@'>" --vprod "    <value nick='@valuenick@' value='@valuenum@'/>" --vtail "  </@type@>" --ftail "</schemalist>" $$^ > $$  tmp && mv $$  tmp $$@
+endef
+
+_GLIB_V_CHECK = $(_glib_v_check_$(V))
+_glib_v_check_ = $(_glib_v_check_$(AM_DEFAULT_VERBOSITY))
+_glib_v_check_0 = @echo "  CHECK " $(subst .valid,.xml,$@);
+
+define _glib_make_schema_validate_rule
+$(subst .xml,.valid,$(1)): $(_GLIB_ENUMS_XML_GENERATED) $(1)
+	$$(_GLIB_V_CHECK) $$(GLIB_COMPILE_SCHEMAS) --strict --dry-run $$(addprefix --schema-file=,$$^) && touch $$@
+endef
+
+define _glib_make_schema_rules
+all-am: $(_GLIB_GSETTINGS_VALID_FILES)
+
+install-data-am: glib-install-schemas-hook
+
+glib-install-schemas-hook: install-gsettingsschemaDATA
+	@test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || (echo $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir))
+
+uninstall-am: glib-uninstall-schemas-hook
+
+glib-uninstall-schemas-hook: uninstall-gsettingsschemaDATA
+	@test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || (echo $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir))
+
+.PHONY: glib-install-schemas-hook glib-uninstall-schemas-hook
+endef
+
+_GLIB_CLEANFILES += $(_GLIB_ENUMS_XML_GENERATED) $(_GLIB_GSETTINGS_VALID_FILES)
+
+$(foreach f,$(_GLIB_ENUMS_XML_GENERATED),$(eval $(call _glib_make_enums_xml_rule,$f)))
+$(foreach f,$(_GLIB_GSETTINGS_SCHEMA_FILES),$(eval $(call _glib_make_schema_validate_rule,$f)))
+$(if $(_GLIB_GSETTINGS_SCHEMA_FILES),$(eval $(_glib_make_schema_rules)))
+
+
+### Cleanup
+.PHONY: clean-glib distclean-glib
+
+clean-am: clean-glib
+clean-glib:
+	$(if $(strip $(_GLIB_CLEANFILES)),-rm -f $(_GLIB_CLEANFILES))
+
+distclean-am: distclean-glib
+distclean-glib:
+	$(if $(strip $(_GLIB_DISTCLEANFILES)),-rm -f $(_GLIB_DISTCLEANFILES))
diff --git a/configure.ac b/configure.ac
index 09a8de6..255a5d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,9 @@ if test "$GLIB_LIBS" = ""; then
 fi
 GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
 
+GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
+AC_SUBST(GLIB_MAKEFILE)
+
 PKG_CHECK_MODULES(XML, libxml-2.0)
 AC_SUBST(XML_CFLAGS)
 AC_SUBST(XML_LIBS)
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index 096f0fb..aa13eec 100644
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+include $(GLIB_MAKEFILE)
+
 if OS_WIN32
 LIBWS2_32 = -lws2_32
 endif
@@ -14,35 +16,6 @@ INCLUDES = 				\
 	$(SQLITE_CFLAGS)		\
 	$(GNOME_KEYRING_CFLAGS)
 
-MARSHAL_GENERATED = soup-marshal.c soup-marshal.h
-MKENUMS_GENERATED = soup-enum-types.c soup-enum-types.h
-
-soup-marshal.h: soup-marshal.list
-	$(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=soup_marshal $(srcdir)/soup-marshal.list --header > soup-marshal.tmp \
-	&& mv soup-marshal.tmp soup-marshal.h ) \
-	|| ( rm -f soup-marshal.tmp && exit 1 )
-
-soup-marshal.c: soup-marshal.h
-	$(AM_V_GEN) ( (echo '#include "soup-marshal.h"'; $(GLIB_GENMARSHAL) --prefix=soup_marshal $(srcdir)/soup-marshal.list --body) > soup-marshal.tmp \
-	&& mv soup-marshal.tmp soup-marshal.c ) \
-	|| ( rm -f soup-marshal.tmp && exit 1 )
-
-soup-enum-types.h: $(soup_headers)
-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template soup-enum-types.h.tmpl \
-		$(soup_headers) ) > soup-enum-types.h.tmp \
-	&& mv soup-enum-types.h.tmp soup-enum-types.h \
-	|| rm -f soup-enum-type.h.tmp
-
-soup-enum-types.c: $(libsoupinclude_HEADERS)
-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template soup-enum-types.c.tmpl \
-		$(soup_headers) ) > soup-enum-types.c.tmp \
-	&& mv soup-enum-types.c.tmp soup-enum-types.c \
-	|| rm -f soup-enum-type.c.tmp
-
-BUILT_SOURCES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
-
-CLEANFILES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
-
 libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
 
 soup_headers =			\
@@ -106,7 +79,6 @@ libsoup_2_4_la_LIBADD =			\
 	$(LIBWS2_32)
 
 libsoup_2_4_la_SOURCES =		\
-	$(BUILT_SOURCES)		\
 	soup-address.c			\
 	soup-auth.c			\
 	soup-auth-basic.h		\
@@ -134,11 +106,15 @@ libsoup_2_4_la_SOURCES =		\
 	soup-date.c			\
 	soup-directory-input-stream.h	\
 	soup-directory-input-stream.c	\
+	soup-enum-types.h		\
+	soup-enum-types.c		\
 	soup-form.c			\
 	soup-headers.c			\
 	soup-http-input-stream.h	\
 	soup-http-input-stream.c	\
 	soup-logger.c			\
+	soup-marshal.h			\
+	soup-marshal.c			\
 	soup-message.c			\
 	soup-message-body.c		\
 	soup-message-client-io.c	\
@@ -213,6 +189,14 @@ libsoup_gnome_2_4_la_SOURCES =		\
 
 endif
 
+GLIB_GENERATED = soup-marshal.c soup-marshal.h
+GLIB_GENERATED += soup-enum-types.c soup-enum-types.h
+BUILT_SOURCES = $(GLIB_GENERATED)
+
+soup_marshal_sources = $(libsoup_2_4_la_SOURCES) $(libsoup_gnome_2_4_la_SOURCES)
+soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
+soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API"
+
 #
 # Introspection support
 #
@@ -271,11 +255,6 @@ gir_DATA = $(INTROSPECTION_GIRS)
 typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-CLEANFILES += $(gir_DATA) $(typelib_DATA)
+CLEANFILES = $(gir_DATA) $(typelib_DATA)
 
 endif
-
-EXTRA_DIST=				\
-	soup-marshal.list		\
-	soup-enum-types.h.tmpl		\
-	soup-enum-types.c.tmpl
diff --git a/libsoup/soup-auth-manager.c b/libsoup/soup-auth-manager.c
index cc0f3c9..12e3f4e 100644
--- a/libsoup/soup-auth-manager.c
+++ b/libsoup/soup-auth-manager.c
@@ -123,7 +123,7 @@ soup_auth_manager_class_init (SoupAuthManagerClass *auth_manager_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupAuthManagerClass, authenticate),
 			      NULL, NULL,
-			      soup_marshal_NONE__OBJECT_OBJECT_BOOLEAN,
+			      _soup_marshal_NONE__OBJECT_OBJECT_BOOLEAN,
 			      G_TYPE_NONE, 3,
 			      SOUP_TYPE_MESSAGE,
 			      SOUP_TYPE_AUTH,
diff --git a/libsoup/soup-auth.c b/libsoup/soup-auth.c
index e6d103d..e72e5c3 100644
--- a/libsoup/soup-auth.c
+++ b/libsoup/soup-auth.c
@@ -117,7 +117,7 @@ soup_auth_class_init (SoupAuthClass *auth_class)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_FIRST,
 			      0, NULL, NULL,
-			      soup_marshal_NONE__STRING_STRING,
+			      _soup_marshal_NONE__STRING_STRING,
 			      G_TYPE_NONE, 2,
 			      G_TYPE_STRING,
 			      G_TYPE_STRING);
diff --git a/libsoup/soup-connection.c b/libsoup/soup-connection.c
index 199be73..3b8ae1b 100644
--- a/libsoup/soup-connection.c
+++ b/libsoup/soup-connection.c
@@ -167,7 +167,7 @@ soup_connection_class_init (SoupConnectionClass *connection_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupConnectionClass, disconnected),
 			      NULL, NULL,
-			      soup_marshal_NONE__NONE,
+			      _soup_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	/* properties */
diff --git a/libsoup/soup-cookie-jar.c b/libsoup/soup-cookie-jar.c
index 2abb165..1f6500f 100644
--- a/libsoup/soup-cookie-jar.c
+++ b/libsoup/soup-cookie-jar.c
@@ -144,7 +144,7 @@ soup_cookie_jar_class_init (SoupCookieJarClass *jar_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupCookieJarClass, changed),
 			      NULL, NULL,
-			      soup_marshal_NONE__BOXED_BOXED,
+			      _soup_marshal_NONE__BOXED_BOXED,
 			      G_TYPE_NONE, 2, 
 			      SOUP_TYPE_COOKIE | G_SIGNAL_TYPE_STATIC_SCOPE,
 			      SOUP_TYPE_COOKIE | G_SIGNAL_TYPE_STATIC_SCOPE);
diff --git a/libsoup/soup-message.c b/libsoup/soup-message.c
index cdc4392..c70a954 100644
--- a/libsoup/soup-message.c
+++ b/libsoup/soup-message.c
@@ -227,7 +227,7 @@ soup_message_class_init (SoupMessageClass *message_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupMessageClass, wrote_informational),
 			      NULL, NULL,
-			      soup_marshal_NONE__NONE,
+			      _soup_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	/**
@@ -245,7 +245,7 @@ soup_message_class_init (SoupMessageClass *message_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupMessageClass, wrote_headers),
 			      NULL, NULL,
-			      soup_marshal_NONE__NONE,
+			      _soup_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	/**
@@ -267,7 +267,7 @@ soup_message_class_init (SoupMessageClass *message_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupMessageClass, wrote_chunk),
 			      NULL, NULL,
-			      soup_marshal_NONE__NONE,
+			      _soup_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	/**
@@ -290,7 +290,7 @@ soup_message_class_init (SoupMessageClass *message_class)
 			      G_SIGNAL_RUN_FIRST,
 			      0, /* FIXME after next ABI break */
 			      NULL, NULL,
-			      soup_marshal_NONE__BOXED,
+			      _soup_marshal_NONE__BOXED,
 			      G_TYPE_NONE, 1,
 			      SOUP_TYPE_BUFFER);
 
@@ -311,7 +311,7 @@ soup_message_class_init (SoupMessageClass *message_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupMessageClass, wrote_body),
 			      NULL, NULL,
-			      soup_marshal_NONE__NONE,
+			      _soup_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	/**
@@ -334,7 +334,7 @@ soup_message_class_init (SoupMessageClass *message_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupMessageClass, got_informational),
 			      NULL, NULL,
-			      soup_marshal_NONE__NONE,
+			      _soup_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	/**
@@ -366,7 +366,7 @@ soup_message_class_init (SoupMessageClass *message_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupMessageClass, got_headers),
 			      NULL, NULL,
-			      soup_marshal_NONE__NONE,
+			      _soup_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	/**
@@ -389,7 +389,7 @@ soup_message_class_init (SoupMessageClass *message_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupMessageClass, got_chunk),
 			      NULL, NULL,
-			      soup_marshal_NONE__BOXED,
+			      _soup_marshal_NONE__BOXED,
 			      G_TYPE_NONE, 1,
 			      /* Use %G_SIGNAL_TYPE_STATIC_SCOPE so that
 			       * the %SOUP_MEMORY_TEMPORARY buffers used
@@ -418,7 +418,7 @@ soup_message_class_init (SoupMessageClass *message_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupMessageClass, got_body),
 			      NULL, NULL,
-			      soup_marshal_NONE__NONE,
+			      _soup_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	/**
@@ -455,7 +455,7 @@ soup_message_class_init (SoupMessageClass *message_class)
 			      G_SIGNAL_RUN_FIRST,
 			      0,
 			      NULL, NULL,
-			      soup_marshal_NONE__STRING_BOXED,
+			      _soup_marshal_NONE__STRING_BOXED,
 			      G_TYPE_NONE, 2,
 			      G_TYPE_STRING,
 			      G_TYPE_HASH_TABLE);
@@ -475,7 +475,7 @@ soup_message_class_init (SoupMessageClass *message_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupMessageClass, restarted),
 			      NULL, NULL,
-			      soup_marshal_NONE__NONE,
+			      _soup_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	/**
@@ -492,7 +492,7 @@ soup_message_class_init (SoupMessageClass *message_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupMessageClass, finished),
 			      NULL, NULL,
-			      soup_marshal_NONE__NONE,
+			      _soup_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	/**
diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c
index a025d8c..96704ce 100644
--- a/libsoup/soup-server.c
+++ b/libsoup/soup-server.c
@@ -247,7 +247,7 @@ soup_server_class_init (SoupServerClass *server_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupServerClass, request_started),
 			      NULL, NULL,
-			      soup_marshal_NONE__OBJECT_POINTER,
+			      _soup_marshal_NONE__OBJECT_POINTER,
 			      G_TYPE_NONE, 2, 
 			      SOUP_TYPE_MESSAGE,
 			      SOUP_TYPE_CLIENT_CONTEXT);
@@ -272,7 +272,7 @@ soup_server_class_init (SoupServerClass *server_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupServerClass, request_read),
 			      NULL, NULL,
-			      soup_marshal_NONE__OBJECT_POINTER,
+			      _soup_marshal_NONE__OBJECT_POINTER,
 			      G_TYPE_NONE, 2,
 			      SOUP_TYPE_MESSAGE,
 			      SOUP_TYPE_CLIENT_CONTEXT);
@@ -292,7 +292,7 @@ soup_server_class_init (SoupServerClass *server_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupServerClass, request_finished),
 			      NULL, NULL,
-			      soup_marshal_NONE__OBJECT_POINTER,
+			      _soup_marshal_NONE__OBJECT_POINTER,
 			      G_TYPE_NONE, 2,
 			      SOUP_TYPE_MESSAGE,
 			      SOUP_TYPE_CLIENT_CONTEXT);
@@ -321,7 +321,7 @@ soup_server_class_init (SoupServerClass *server_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupServerClass, request_aborted),
 			      NULL, NULL,
-			      soup_marshal_NONE__OBJECT_POINTER,
+			      _soup_marshal_NONE__OBJECT_POINTER,
 			      G_TYPE_NONE, 2,
 			      SOUP_TYPE_MESSAGE,
 			      SOUP_TYPE_CLIENT_CONTEXT);
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index 79ed51d..67d4ba0 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -341,7 +341,7 @@ soup_session_class_init (SoupSessionClass *session_class)
 			      G_SIGNAL_RUN_FIRST,
 			      0, /* FIXME? */
 			      NULL, NULL,
-			      soup_marshal_NONE__OBJECT,
+			      _soup_marshal_NONE__OBJECT,
 			      G_TYPE_NONE, 1,
 			      SOUP_TYPE_MESSAGE);
 
@@ -361,7 +361,7 @@ soup_session_class_init (SoupSessionClass *session_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupSessionClass, request_started),
 			      NULL, NULL,
-			      soup_marshal_NONE__OBJECT_OBJECT,
+			      _soup_marshal_NONE__OBJECT_OBJECT,
 			      G_TYPE_NONE, 2,
 			      SOUP_TYPE_MESSAGE,
 			      SOUP_TYPE_SOCKET);
@@ -384,7 +384,7 @@ soup_session_class_init (SoupSessionClass *session_class)
 			      G_SIGNAL_RUN_FIRST,
 			      0, /* FIXME? */
 			      NULL, NULL,
-			      soup_marshal_NONE__OBJECT,
+			      _soup_marshal_NONE__OBJECT,
 			      G_TYPE_NONE, 1,
 			      SOUP_TYPE_MESSAGE);
 
@@ -417,7 +417,7 @@ soup_session_class_init (SoupSessionClass *session_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupSessionClass, authenticate),
 			      NULL, NULL,
-			      soup_marshal_NONE__OBJECT_OBJECT_BOOLEAN,
+			      _soup_marshal_NONE__OBJECT_OBJECT_BOOLEAN,
 			      G_TYPE_NONE, 3,
 			      SOUP_TYPE_MESSAGE,
 			      SOUP_TYPE_AUTH,
@@ -440,7 +440,7 @@ soup_session_class_init (SoupSessionClass *session_class)
 			      G_SIGNAL_RUN_FIRST,
 			      0,
 			      NULL, NULL,
-			      soup_marshal_NONE__OBJECT,
+			      _soup_marshal_NONE__OBJECT,
 			      G_TYPE_NONE, 1,
 			      /* SoupConnection is private, so we can't use
 			       * SOUP_TYPE_CONNECTION here.
@@ -464,7 +464,7 @@ soup_session_class_init (SoupSessionClass *session_class)
 			      G_SIGNAL_RUN_FIRST,
 			      0,
 			      NULL, NULL,
-			      soup_marshal_NONE__OBJECT,
+			      _soup_marshal_NONE__OBJECT,
 			      G_TYPE_NONE, 1,
 			      /* SoupConnection is private, so we can't use
 			       * SOUP_TYPE_CONNECTION here.
diff --git a/libsoup/soup-socket.c b/libsoup/soup-socket.c
index 452fada..42f1fed 100644
--- a/libsoup/soup-socket.c
+++ b/libsoup/soup-socket.c
@@ -209,7 +209,7 @@ soup_socket_class_init (SoupSocketClass *socket_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (SoupSocketClass, readable),
 			      NULL, NULL,
-			      soup_marshal_NONE__NONE,
+			      _soup_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	/**
@@ -225,7 +225,7 @@ soup_socket_class_init (SoupSocketClass *socket_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (SoupSocketClass, writable),
 			      NULL, NULL,
-			      soup_marshal_NONE__NONE,
+			      _soup_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	/**
@@ -241,7 +241,7 @@ soup_socket_class_init (SoupSocketClass *socket_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (SoupSocketClass, disconnected),
 			      NULL, NULL,
-			      soup_marshal_NONE__NONE,
+			      _soup_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	/**
@@ -261,7 +261,7 @@ soup_socket_class_init (SoupSocketClass *socket_class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SoupSocketClass, new_connection),
 			      NULL, NULL,
-			      soup_marshal_NONE__OBJECT,
+			      _soup_marshal_NONE__OBJECT,
 			      G_TYPE_NONE, 1,
 			      SOUP_TYPE_SOCKET);
 	/**
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]