gmime r1407 - in trunk: . gmime

[fejj svn gnome org]

Author: fejj
Date: Tue Aug 19 14:59:43 2008
New Revision: 1407
URL: http://svn.gnome.org/viewvc/gmime?rev=1407&view=rev

Log:
reverted build changes which weren't needed

Modified:
   trunk/configure.in
   trunk/gmime/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Aug 19 14:59:43 2008
@@ -80,9 +80,6 @@
 
 AM_MAINTAINER_MODE
 
-GMIME_MARSHAL_RULE=$srcdir/marshal.mk
-AC_SUBST_FILE(GMIME_MARSHAL_RULE)
-
 dnl Checks for header files.
 AC_CHECK_HEADERS(sys/mman.h)
 AC_CHECK_HEADERS(sys/param.h)

Modified: trunk/gmime/Makefile.am
==============================================================================
--- trunk/gmime/Makefile.am	(original)
+++ trunk/gmime/Makefile.am	Tue Aug 19 14:59:43 2008
@@ -48,7 +48,6 @@
 	gmime-header.c			\
 	gmime-iconv.c			\
 	gmime-iconv-utils.c		\
-	gmime-marshal.c			\
 	gmime-message.c			\
 	gmime-message-part.c		\
 	gmime-message-partial.c		\
@@ -100,7 +99,6 @@
 	gmime-header.h			\
 	gmime-iconv.h			\
 	gmime-iconv-utils.h		\
-	gmime-marshal.h			\
 	gmime-message.h			\
 	gmime-message-part.h		\
 	gmime-message-partial.h		\
@@ -131,9 +129,6 @@
 	gmime-table-private.h		\
 	gmime-charset-map-private.h
 
-MARSHAL_GENERATED = gmime-marshal.c gmime-marshal.h
- GMIME_MARSHAL_RULE@
-
 install-data-local: install-libtool-import-lib
 
 uninstall-local: uninstall-libtool-import-lib
@@ -167,11 +162,3 @@
 charset_map_LDFLAGS = 
 charset_map_DEPENDENCIES = 
 charset_map_LDADD = $(top_builddir)/util/libutil.la $(GLIB_LIBS)
-
-BUILT_SOURCES = $(MARSHAL_GENERATED)
-CLEANFILES    = $(BUILT_SOURCES)
-
-EXTRA_DIST = gmime-marshal.list
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)