devhelp r1206 - in trunk: . build

[rhult svn gnome org]

Author: rhult
Date: Fri Oct 10 20:25:22 2008
New Revision: 1206
URL: http://svn.gnome.org/viewvc/devhelp?rev=1206&view=rev

Log:
2008-10-10  Richard Hult  <richard imendio com>

	* build/Makefile.am.common:
	* build/Makefile.am.marshal:
	* configure.in: Add build dir and the beginnings of makefile stuff
	to make things cleaner (build dir also used as aux dir for auto*,
	inspired by cairo).


Added:
   trunk/build/
   trunk/build/Makefile.am.common
   trunk/build/Makefile.am.marshal
Modified:
   trunk/configure.in

Added: trunk/build/Makefile.am.common
==============================================================================
--- (empty file)
+++ trunk/build/Makefile.am.common	Fri Oct 10 20:25:22 2008
@@ -0,0 +1,9 @@
+BUILT_SOURCES =
+CLEANFILES =
+DISTCLEANFILES =
+EXTRA_DIST =
+MAINTAINERCLEANFILES =
+
+CLEANFILES += $(BUILT_SOURCES)
+MAINTAINERCLEANFILES += Makefile.in
+AM_CPPFLAGS = -I$(top_srcdir)

Added: trunk/build/Makefile.am.marshal
==============================================================================
--- (empty file)
+++ trunk/build/Makefile.am.marshal	Fri Oct 10 20:25:22 2008
@@ -0,0 +1,21 @@
+$(MARSHAL)-marshal.h: $(MARSHAL)-marshal.list
+	(cd $(srcdir) && \
+	$(GLIB_GENMARSHAL) --prefix=_$(MARSHAL)_marshal $(MARSHAL)-marshal.list --header) > xgen-gmh \
+	&& (cmp -s xgen-gmh $(MARSHAL)-marshal.h || cp xgen-gmh $(MARSHAL)-marshal.h) \
+	&& rm -f xgen-gmh xgen-gmh~
+
+$(MARSHAL)-marshal.c: $(MARSHAL)-marshal.list
+	(cd $(srcdir) && \
+	echo "#include \"$(MARSHAL)-marshal.h\""; \
+	$(GLIB_GENMARSHAL) --prefix=_$(MARSHAL)_marshal $(MARSHAL)-marshal.list --body) > xgen-gmc \
+	&& cp xgen-gmc $(MARSHAL)-marshal.c \
+	&& rm -f xgen-gmc xgen-gmc~
+
+BUILT_SOURCES += 			\
+	$(MARSHAL)-marshal.h		\
+	$(MARSHAL)-marshal.c		\
+	$(NULL)
+
+EXTRA_DIST +=				\
+	$(MARSHAL)-marshal.list		\
+	$(NULL)

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Oct 10 20:25:22 2008
@@ -2,6 +2,7 @@
 AC_INIT([Devhelp],[0.21],[http://bugzilla.gnome.org/enter_bug.cgi?product=devhelp],[devhelp])
 
 AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_AUX_DIR(build)
 AM_INIT_AUTOMAKE([1.9 no-define -Wall])
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL