[build] Remove circular dependencies in Makefiles

[evince.git] / libdocument / Makefile.am

diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
index 3f9ed2a3387b0809ff0380b26b144f251333902b..357de3df0bda8cd23b12bdf0766d298da16a414b 100644 (file)
--- a/libdocument/Makefile.am
+++ b/libdocument/Makefile.am
@@ -4,13 +4,14 @@ NOINST_H_FILES =                              \
        ev-debug.h                              \
        ev-module.h
 
-INST_H_FILES =                                         \
+INST_H_SRC_FILES =                             \
        ev-annotation.h                         \
        ev-async-renderer.h                     \
        ev-attachment.h                         \
        ev-backends-manager.h                   \
        ev-document-factory.h                   \
        ev-document-annotations.h               \
+       ev-document-attachments.h               \
        ev-document-find.h                      \
        ev-document-fonts.h                     \
        ev-document-forms.h                     \
@@ -24,7 +25,6 @@ INST_H_FILES =                                        \
        ev-document-security.h                  \
        ev-document-thumbnails.h                \
        ev-document-transition.h                \
-       ev-document-type-builtins.h             \
        ev-file-exporter.h                      \
        ev-file-helpers.h                       \
        ev-form-field.h                         \
@@ -41,6 +41,10 @@ INST_H_FILES =                                       \
        ev-transition-effect.h                  \
        ev-version.h
 
+INST_H_FILES =                                         \
+       $(INST_H_SRC_FILES)                     \
+       ev-document-type-builtins.h
+
 headerdir = $(includedir)/evince/$(EV_API_VERSION)/libdocument
 header_DATA = $(INST_H_FILES)
 
@@ -57,6 +61,7 @@ libevdocument_la_SOURCES=                     \
        ev-init.c                               \
        ev-document.c                           \
        ev-document-annotations.c               \
+       ev-document-attachments.c               \
        ev-document-factory.c                   \
        ev-document-thumbnails.c                \
        ev-document-fonts.c                     \
@@ -110,21 +115,26 @@ BUILT_SOURCES =                   \
        ev-document-type-builtins.c     \
        ev-document-type-builtins.h
 
-CLEANFILES = $(BUILT_SOURCES) stamp-ev-document-type-builtins.h
+CLEANFILES =                                   \
+       $(BUILT_SOURCES)                        \
+       stamp-ev-document-type-builtins.h       \
+       stamp-ev-document-type-builtins.c
 
 ev-document-type-builtins.h: stamp-ev-document-type-builtins.h
        @true
-
-stamp-ev-document-type-builtins.h: ev-document-type-builtins.h.template $(INST_H_FILES)
+stamp-ev-document-type-builtins.h: ev-document-type-builtins.h.template $(INST_H_SRC_FILES)
        $(AM_V_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \
        && (cmp -s xgen-etbh ev-document-type-builtins.h || cp xgen-etbh ev-document-type-builtins.h ) \
        && rm -f xgen-etbh \
        && echo timestamp > $(@F)
 
-ev-document-type-builtins.c: ev-document-type-builtins.c.template $(INST_H_FILES)
+ev-document-type-builtins.c: stamp-ev-document-type-builtins.c
+       @true
+stamp-ev-document-type-builtins.c: ev-document-type-builtins.c.template $(INST_H_SRC_FILES)
        $(AM_V_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \
        && (cmp -s xgen-etbc ev-document-type-builtins.c || cp xgen-etbc ev-document-type-builtins.c ) \
-       && rm -f xgen-etbc
+       && rm -f xgen-etbc \
+       && echo timestamp > $(@F)
 
 EXTRA_DIST = \
        ev-document-type-builtins.c.template \
@@ -134,7 +144,7 @@ EXTRA_DIST = \
 
 if ENABLE_INTROSPECTION
 
-EvinceDocument-$(EV_API_VERSION).gir: libevdocument.la Makefile $(INST_H_FILES)
+EvinceDocument-$(EV_API_VERSION).gir: libevdocument.la Makefile $(INST_H_FILES) $(filter %.c,$(libevdocument_la_SOURCES))
        $(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
        $(G_IR_SCANNER) -v --namespace EvinceDocument \
        --strip-prefix=Ev \
@@ -145,7 +155,7 @@ EvinceDocument-$(EV_API_VERSION).gir: libevdocument.la Makefile $(INST_H_FILES)
        --include=GdkPixbuf-2.0 \
        --include=Gtk-2.0 \
        --library=evdocument \
-       --libtool="$(SHAVE_SAVED_LIBTOOL)" \
+       --libtool="$(SAVED_LIBTOOL)" \
        --output $@ \
        --pkg evince-document-$(EV_API_VERSION) \
        -I$(top_srcdir) \
@@ -153,7 +163,8 @@ EvinceDocument-$(EV_API_VERSION).gir: libevdocument.la Makefile $(INST_H_FILES)
        -I$(srcdir) \
        -I$(builddir) \
        -DEVINCE_COMPILATION \
-       $(filter %.h,$^)
+       $(filter %.h,$^) \
+       $(filter %.c,$^)
 
 girdir = $(GIRDIR)
 gir_DATA = EvinceDocument-$(EV_API_VERSION).gir
@@ -172,3 +183,5 @@ CLEANFILES += $(gir_DATA) $(typelibs_DATA)
        $< -o $@
 
 endif # ENABLE_INTROSPECTION
+
+-include $(top_srcdir)/git.mk