Fix non-sourcedir build failures

Fix make rules and CFLAGS so the whole project can be built outside source
tree. (Bug #581869)
parent d308859a
......@@ -267,7 +267,7 @@ PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
dnl Setup Anjuta Library flags
dnl --------------------------
LIBANJUTA_CFLAGS='$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GDL_CFLAGS) $(GNOME_CFLAGS) $(GLADE_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"'
LIBANJUTA_CFLAGS='$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GDL_CFLAGS) $(GNOME_CFLAGS) $(GLADE_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"'
LIBANJUTA_LIBS='$(top_builddir)/libanjuta/libanjuta.la'
AC_SUBST(LIBANJUTA_CFLAGS)
AC_SUBST(LIBANJUTA_LIBS)
......
......@@ -31,11 +31,11 @@ BUILT_SOURCES = \
anjuta-marshal.h
anjuta-marshal.h: anjuta-marshal.list
glib-genmarshal anjuta-marshal.list --header --prefix=anjuta_marshal > $@
glib-genmarshal $< --header --prefix=anjuta_marshal > $@
anjuta-marshal.c: anjuta-marshal.list
echo "#include \"anjuta-marshal.h\"" > $@ && \
glib-genmarshal anjuta-marshal.list --body --prefix=anjuta_marshal >> $@
glib-genmarshal $< --body --prefix=anjuta_marshal >> $@
libanjuta_debug_manager_la_SOURCES = \
$(BUILT_SOURCES) \
......
......@@ -59,14 +59,14 @@ libfile_manager_la_LIBADD = \
file-view-marshal.h: file-view-marshal.list
@GLIB_GENMARSHAL@ \
--prefix=file_view_cclosure_marshal file-view-marshal.list --header > xgen-gmc \
--prefix=file_view_cclosure_marshal $< --header > xgen-gmc \
&& cp xgen-gmc $(@F) \
&& rm -f xgen-gmc
file-view-marshal.c: file-view-marshal.h file-view-marshal.list
file-view-marshal.c: file-view-marshal.list
echo "#include \"file-view-marshal.h\"" > xgen-gmc \
&& @GLIB_GENMARSHAL@ \
--prefix=file_view_cclosure_marshal file-view-marshal.list --body >> xgen-gmc \
--prefix=file_view_cclosure_marshal $< --body >> xgen-gmc \
&& cp xgen-gmc $(@F) \
&& rm -f xgen-gmc
......
......@@ -28,11 +28,11 @@ marshallers_SOURCES = \
anjuta-glade-marshallers.h
anjuta-glade-marshallers.h: anjuta-glade-marshallers.list
glib-genmarshal anjuta-glade-marshallers.list --header --prefix=anjuta_glade_marshallers > $@
glib-genmarshal $< --header --prefix=anjuta_glade_marshallers > $@
anjuta-glade-marshallers.c: anjuta-glade-marshallers.list anjuta-glade-marshallers.h
echo "#include \"anjuta-glade-marshallers.h\"" > $@ && \
glib-genmarshal anjuta-glade-marshallers.list --body --prefix=anjuta_glade_marshallers >> $@
glib-genmarshal $< --body --prefix=anjuta_glade_marshallers >> $@
# Include paths
AM_CPPFLAGS = \
......
......@@ -38,11 +38,11 @@ BUILT_SOURCES = \
anjuta-marshal.h
anjuta-marshal.h: anjuta-marshal.list
glib-genmarshal anjuta-marshal.list --header --prefix=anjuta_marshal > $@
glib-genmarshal $< --header --prefix=anjuta_marshal > $@
anjuta-marshal.c: anjuta-marshal.list
echo "#include \"anjuta-marshal.h\"" > $@ && \
glib-genmarshal anjuta-marshal.list --body --prefix=anjuta_marshal >> $@
glib-genmarshal $< --body --prefix=anjuta_marshal >> $@
# The plugin
plugin_LTLIBRARIES = libanjuta-sourceview.la
......
......@@ -5,14 +5,14 @@ prefs_glade_schemas = $(prefs_glade_files:.glade=.schemas)
prefs_glade_schemas_DATA = $(prefs_glade_schemas)
%.schemas: %.glade
$(top_srcdir)/scripts/glade2schema.pl $(srcdir)/$(?) > $(@)
$(top_srcdir)/scripts/glade2schema.pl $< > $@
prefs_ui_schemasdir = @GCONF_SCHEMA_FILE_DIR@
prefs_ui_schemas = $(prefs_ui_files:.ui=.schemas)
prefs_ui_schemas_DATA = $(prefs_ui_schemas)
%.schemas: %.ui
$(top_srcdir)/scripts/builder2schema.pl $(srcdir)/$(?) > $(@)
$(top_srcdir)/scripts/builder2schema.pl $< > $@
if GCONF_SCHEMAS_INSTALL
install-data-local: $(prefs_glade_schemas) $(prefs_ui_schemas)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment