diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-03-03 08:33:29 -0500 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-03-17 09:35:47 -0400 |
| commit | 05a53b86e9672d6184bf1c733e9a9e5119f78943 (patch) | |
| tree | 7d6a262588f120bf5e674456bb43b4f3929e163e | |
| parent | 26b3dd2e8921796839391d99eab98f195765b0fe (diff) | |
| download | evolution-data-server-05a53b86e9672d6184bf1c733e9a9e5119f78943.tar.gz | |
Remove marshal.mk and EVO_MARSHAL_RULE automake macro.
No longer used.
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | marshal.mk | 7 |
3 files changed, 0 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index 85a52d244..f584b73f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,6 @@ EXTRA_DIST = \ MAINTAINERS \ TODO \ NEWS \ - marshal.mk \ iconv-detect.c \ intltool-merge.in \ intltool-update.in \ diff --git a/configure.ac b/configure.ac index e446947ce..e7d1065b9 100644 --- a/configure.ac +++ b/configure.ac @@ -1371,15 +1371,6 @@ else fi 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 Utility macro to set compiler flags for a specific lib. dnl EVO_SET_COMPILE_FLAGS(VAR-PREFIX, DEPS, EXTRA-CFLAGS, EXTRA-LIBS) dnl ****************************** @@ -1614,10 +1605,6 @@ dnl ****************************** GLIB_GSETTINGS 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 gperf stuff dnl ****************************** diff --git a/marshal.mk b/marshal.mk deleted file mode 100644 index 5aa50f8f4..000000000 --- a/marshal.mk +++ /dev/null @@ -1,7 +0,0 @@ -%.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 -,_,$*) $< --body) > $@.tmp \ - && mv $@.tmp $@ ) || ( rm -f $@.tmp && exit 1 ) |