diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | marshal.mk | 7 |
4 files changed, 28 insertions, 2 deletions
@@ -1,3 +1,14 @@ +2003-07-23 Dan Winship <danw@ximian.com> + + * configure.in: Define EVO_MARSHAL_RULE, which creates glib + marshaller .c and .h files that don't cause gcc warnings + + * marshal.mk: The Makefile fragment used by EVO_MARSHAL_RULE. + (Can't include newlines in an AC_SUBST, so we have to use + AC_SUBST_FILE) + + * Makefile.am (EXTRA_DIST): add marshal.mk + 2003-07-20 Hasbullah Bin Pit <sebol@ikhlas.com> *configure.in: Added 'ms' (Malay) to ALL_LINGUAS. diff --git a/Makefile.am b/Makefile.am index c484d41355..035b4d3d06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,7 @@ EXTRA_DIST = \ MAINTAINERS \ NEWS \ NEWS-1.0 \ + marshal.mk \ intltool-merge.in \ intltool-update.in \ intltool-extract.in \ diff --git a/configure.in b/configure.in index 6d42574ac0..393f45a9c4 100644 --- a/configure.in +++ b/configure.in @@ -1016,6 +1016,15 @@ fi AC_SUBST(OPENSSL_CFLAGS) AC_SUBST(OPENSSL_LDFLAGS) +dnl ******************* +dnl GObject marshalling +dnl ******************* +AM_PATH_GLIB_2_0 + +dnl We use AC_SUBST_FILE because AC_SUBST won't deal with newlines +EVO_MARSHAL_RULE=$srcdir/marshal.mk +AC_SUBST_FILE(EVO_MARSHAL_RULE) + dnl ************************* dnl CFLAGS and LIBS and stuff dnl ************************* @@ -1030,8 +1039,6 @@ IDL_INCLUDES="-I "`pkg-config --variable=idldir libbonobo-2.0`" -I "`pkg-config AC_MSG_RESULT($IDL_INCLUDES) AC_SUBST(IDL_INCLUDES) -AM_PATH_GLIB_2_0 - dnl Utility macro to set compiler flags for a specific lib. AC_DEFUN(EVO_SET_COMPILE_FLAGS, [ deps="$2" diff --git a/marshal.mk b/marshal.mk new file mode 100644 index 0000000000..9d4298deae --- /dev/null +++ b/marshal.mk @@ -0,0 +1,7 @@ +%.h: %.list + ( $(GLIB_GENMARSHAL) --prefix=$(subst -,_,$*) $< --header > $@.tmp \ + && mv $@.tmp $@ ) || ( rm -f $@.tmp && exit 1 ) + +%.c: %.list %.h + ( (echo "#include \"$*.h\""; $(GLIB_GENMARSHAL) --prefix=$(subst -,_,$*) $*.list --body) > $@.tmp \ + && mv $@.tmp $@ ) || ( rm -f $@.tmp && exit 1 ) |