Use non-recursive make to build gitg

This commit is contained in:
Jesse van den Kieboom 2014-01-04 14:59:02 +01:00
parent 60aa7fa70d
commit 49adf204fa
3 changed files with 44 additions and 47 deletions

View file

@ -2,7 +2,7 @@
ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
SUBDIRS = libgd plugins gitg data po tests
SUBDIRS = libgd plugins data po tests
DISTCLEANFILES = \
intltool-extract \
@ -82,9 +82,11 @@ noinst_HEADERS =
GITIGNOREFILES =
CLEANFILES =
lib_LTLIBRARIES =
bin_PROGRAMS =
include libgitg/Makefile.am
include libgitg-ext/Makefile.am
include gitg/Makefile.am
%.typelib: %.gir
$(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) --includedir=. -o $@ $<

View file

@ -287,7 +287,6 @@ Makefile
libgd/Makefile
libgitg/libgitg-1.0.pc
libgitg-ext/libgitg-ext-1.0.pc
gitg/Makefile
data/Makefile
data/gitg.desktop.in
data/icons/Makefile

View file

@ -1,6 +1,6 @@
bin_PROGRAMS = gitg
bin_PROGRAMS += gitg/gitg
gitg_CPPFLAGS = \
gitg_gitg_CPPFLAGS = \
-I$(top_srcdir) \
-I$(srcdir) \
-I$(top_srcdir)/libgd \
@ -8,12 +8,12 @@ gitg_CPPFLAGS = \
-DGITG_DATADIR=\""$(datadir)/gitg"\" \
-DGITG_LOCALEDIR=\""$(datadir)/locale"\"
gitg_CFLAGS = \
gitg_gitg_CFLAGS = \
$(GITG_CFLAGS) \
$(WARN_CFLAGS) \
-w
gitg_VALAFLAGS = \
gitg_gitg_VALAFLAGS = \
--vapidir $(top_srcdir)/vapi \
$(GITG_VALAFLAGS) \
--pkg config \
@ -30,63 +30,59 @@ gitg_VALAFLAGS = \
--pkg gtksourceview-3.0 \
--pkg GtkSpell-3.0 \
--girdir "$(top_builddir)/libgd" \
--girdir "$(top_builddir)/libgitg" \
--girdir "$(top_builddir)/libgitg-ext" \
--girdir "$(top_builddir)" \
--vapidir "$(top_srcdir)/vapi" \
--vapidir "$(top_builddir)/libgd" \
--vapidir "$(top_builddir)/libgitg" \
--vapidir "$(top_builddir)/libgitg-ext" \
--gresources "$(top_srcdir)/gitg/resources/gitg-resources.xml"
gitg_LDADD = \
gitg_gitg_LDADD = \
$(GITG_LIBS) \
$(PACKAGE_LIBS) \
$(top_builddir)/libgd/libgd.la \
$(top_builddir)/libgitg/libgitg-1.0.la \
$(top_builddir)/libgitg-ext/libgitg-ext-1.0.la
gitg_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
gitg_gitg_LDFLAGS = \
-export-dynamic \
-no-undefined \
-export-symbols-regex "^[[^_]].*"
gitg_VALASOURCES = \
gitg.vala \
gitg-dirs.vala \
gitg-window.vala \
gitg-clone-dialog.vala \
gitg-author-details-dialog.vala \
gitg-resource.vala \
gitg-application.vala \
gitg-plugins-engine.vala \
gitg-ui-elements.vala \
preferences/gitg-preferences-commit.vala \
preferences/gitg-preferences-dialog.vala \
preferences/gitg-preferences-interface.vala \
preferences/gitg-preferences-history.vala \
history/gitg-history.vala \
history/gitg-history-navigation.vala \
history/gitg-history-paned.vala \
commit/gitg-commit.vala \
commit/gitg-commit-paned.vala \
commit/gitg-commit-dialog.vala
gitg_gitg_VALASOURCES = \
gitg/gitg.vala \
gitg/gitg-dirs.vala \
gitg/gitg-window.vala \
gitg/gitg-clone-dialog.vala \
gitg/gitg-author-details-dialog.vala \
gitg/gitg-resource.vala \
gitg/gitg-application.vala \
gitg/gitg-plugins-engine.vala \
gitg/gitg-ui-elements.vala \
gitg/preferences/gitg-preferences-commit.vala \
gitg/preferences/gitg-preferences-dialog.vala \
gitg/preferences/gitg-preferences-interface.vala \
gitg/preferences/gitg-preferences-history.vala \
gitg/history/gitg-history.vala \
gitg/history/gitg-history-navigation.vala \
gitg/history/gitg-history-paned.vala \
gitg/commit/gitg-commit.vala \
gitg/commit/gitg-commit-paned.vala \
gitg/commit/gitg-commit-dialog.vala
gitg_SOURCES = \
$(gitg_VALASOURCES) \
gitg-resources.c
gitg_gitg_SOURCES = \
$(gitg_gitg_VALASOURCES) \
gitg/gitg-resources.c
gitg-resources.c: resources/gitg-resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources $(srcdir)/resources/gitg-resources.xml)
$(GLIB_COMPILE_RESOURCES) --generate-source \
--sourcedir $(srcdir)/resources \
--target "$@" "$<"
gitg_resources_deps = $(call GRESDEPS,gitg/resources/gitg-resources.xml)
gitg/gitg-resources.c: $(gitg_resources_deps)
$(GRESGEN)
GITIGNOREFILES = \
$(gitg_VALASOURCES:%.vala=%.c) \
gitg_vala.stamp
GITIGNOREFILES += \
$(gitg_gitg_VALASOURCES:%.vala=%.c) \
gitg_gitg_vala.stamp
CLEANFILES = gitg-resources.c
EXTRA_DIST = \
resources/gitg-resources.xml \
$(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources $(srcdir)/resources/gitg-resources.xml)
-include $(top_srcdir)/git.mk
CLEANFILES += gitg/gitg-resources.c
EXTRA_DIST += $(gitg_resources_deps)
# vi:ts=8:noet