diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | data/Makefile.am | 1 | ||||
| -rw-r--r-- | lib/Makefile.am | 6 | ||||
| -rw-r--r-- | lib/egg/Makefile.am | 13 |
4 files changed, 15 insertions, 13 deletions
@@ -1,3 +1,11 @@ +2004-11-25 Christian Persch <chpe@cvs.gnome.org> + + * data/Makefile.am: + * lib/Makefile.am: + * lib/egg/Makefile.am: + + Build auto-generated files in builddir, not in srcdir. + 2004-11-25 Marco Pesenti Gritti <marco@gnome.org> reviewed by: Christian Persch <chpe@cvs.gnome.org> diff --git a/data/Makefile.am b/data/Makefile.am index c8bbaaefd..a25c35847 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -67,7 +67,6 @@ EXTRA_DIST = \ DISTCLEANFILES = \ $(server_DATA) \ - $(applications_DATA) \ $(schema_DATA) \ $(pkgconfig_DATA) \ $(default_prefs_DATA) \ diff --git a/lib/Makefile.am b/lib/Makefile.am index c90f51ac3..1a7dd3d65 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,7 @@ SUBDIRS = widgets egg INCLUDES = \ + -I$(top_builddir)/lib \ $(EPIPHANY_DEPENDENCY_CFLAGS) \ -DSHARE_DIR=\"$(pkgdatadir)\" @@ -70,12 +71,13 @@ libephymisc_la_SOURCES = \ BUILT_SOURCES=ephy-marshal.c ephy-marshal.h CLEAN_FILES = $(BUILT_SOURCES) +DISTCLEAN_FILES = $(BUILT_SOURCES) ephy-marshal.c: ephy-marshal.list - @GLIB_GENMARSHAL@ --prefix=ephy_marshal $(srcdir)/ephy-marshal.list --header --body > ephy-marshal.c + $(GLIB_GENMARSHAL) --prefix=ephy_marshal $(srcdir)/ephy-marshal.list --header --body > ephy-marshal.c ephy-marshal.h: ephy-marshal.list - @GLIB_GENMARSHAL@ --prefix=ephy_marshal $(srcdir)/ephy-marshal.list --header > ephy-marshal.h + $(GLIB_GENMARSHAL) --prefix=ephy_marshal $(srcdir)/ephy-marshal.list --header > ephy-marshal.h EXTRA_DIST = \ ephy-marshal.list diff --git a/lib/egg/Makefile.am b/lib/egg/Makefile.am index 77b7c0eaa..4920ffbba 100644 --- a/lib/egg/Makefile.am +++ b/lib/egg/Makefile.am @@ -1,4 +1,5 @@ INCLUDES = \ + -I$(top_builddir)/lib/egg \ $(EPIPHANY_DEPENDENCY_CFLAGS) \ -DCURSOR_DIR=\"$(pkgdatadir)/art\" \ -DGTK_DISABLE_DEPRECATED \ @@ -37,18 +38,10 @@ noinst_HEADERS = \ BUILT_SOURCES = eggmarshalers.h eggmarshalers.c eggmarshalers.h: eggmarshalers.list - cd $(srcdir) \ - && $(GLIB_GENMARSHAL) --prefix=_egg_marshal eggmarshalers.list --header > xgen-emh \ - && cp xgen-emh eggmarshalers.h \ - && rm -f xgen-emh xgen-emh~ + $(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header > eggmarshalers.h eggmarshalers.c: eggmarshalers.list - cd $(srcdir) \ - && $(GLIB_GENMARSHAL) --prefix=_egg_marshal eggmarshalers.list --body > xgen-emc \ - && cp xgen-emc eggmarshalers.c \ - && rm -f xgen-emc xgen-emc~ - -egg-marshal.c: eggmarshalers.h eggmarshalers.c + $(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --body > eggmarshalers.c EXTRA_DIST= \ eggmarshalers.list |