[build] Remove circular dependencies in Makefiles

diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
index 4cbc34ea4310d0a18d12eace67f979e44c4d3faa..357de3df0bda8cd23b12bdf0766d298da16a414b 100644 (file)
--- a/libdocument/Makefile.am
+++ b/libdocument/Makefile.am
@@ -4,7 +4,7 @@ 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                         \
@@ -25,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                         \
@@ -42,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)
 
@@ -112,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 \

diff --git a/libview/Makefile.am b/libview/Makefile.am
index 980bc002c105a7cdbb87636e0755c96a5efdcdda..23210fa20ef2adf83f0f7d3ce31bf3d912828680 100644 (file)
--- a/libview/Makefile.am
+++ b/libview/Makefile.am
@@ -12,14 +12,17 @@ NOINST_H_FILES =                    \
        ev-view-marshal.h               \
        ev-view-private.h
 
-INST_H_FILES =                                 \
+INST_H_SRC_FILES =                     \
        ev-document-model.h             \
        ev-jobs.h                       \
        ev-job-scheduler.h              \
        ev-print-operation.h            \
        ev-stock-icons.h                \
        ev-view.h                       \
-       ev-view-presentation.h          \
+       ev-view-presentation.h
+
+INST_H_FILES =                                 \
+       $(INST_H_SRC_FILES)             \
        ev-view-type-builtins.h
 
 headerdir = $(includedir)/evince/$(EV_API_VERSION)/libview
@@ -78,7 +81,10 @@ BUILT_SOURCES =                      \
        ev-view-type-builtins.c         \
        ev-view-type-builtins.h
 
-CLEANFILES = $(BUILT_SOURCES) stamp-ev-view-type-builtins.h
+CLEANFILES =                           \
+       $(BUILT_SOURCES)                \
+       stamp-ev-view-type-builtins.h   \
+       stamp-ev-view-type-builtins.c
 
 ev-view-marshal.h: $(srcdir)/ev-view-marshal.list
        $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=ev_view_marshal $(srcdir)/ev-view-marshal.list --header --internal > $@
@@ -89,17 +95,19 @@ ev-view-marshal.c: $(srcdir)/ev-view-marshal.list
 
 ev-view-type-builtins.h: stamp-ev-view-type-builtins.h
        @true
-
-stamp-ev-view-type-builtins.h: ev-view-type-builtins.h.template $(INST_H_FILES)
+stamp-ev-view-type-builtins.h: ev-view-type-builtins.h.template $(INST_H_SRC_FILES)
        $(AM_V_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \
        && (cmp -s xgen-etbh ev-view-type-builtins.h || cp xgen-etbh ev-view-type-builtins.h ) \
        && rm -f xgen-etbh \
        && echo timestamp > $(@F)
 
-ev-view-type-builtins.c: ev-view-type-builtins.c.template $(INST_H_FILES)
+ev-view-type-builtins.c: stamp-ev-view-type-builtins.c
+       @true
+stamp-ev-view-type-builtins.c: ev-view-type-builtins.c.template $(INST_H_SRC_FILES)
        $(AM_V_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \
        && (cmp -s xgen-etbc ev-view-type-builtins.c || cp xgen-etbc ev-view-type-builtins.c ) \
-       && rm -f xgen-etbc
+       && rm -f xgen-etbc \
+       && echo timestamp > $(@F)
 
 EXTRA_DIST = \
        ev-view-type-builtins.c.template  \