[evince] libview: Don't dist generated files



commit aaf20d9c9962e39d7b727dd5b335a35a29320a04
Author: Christian Persch <chpe gnome org>
Date:   Wed Jun 13 14:07:52 2012 +0200

    libview: Don't dist generated files

 libview/Makefile.am |   24 +++++++++++++++---------
 shell/Makefile.am   |    2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/libview/Makefile.am b/libview/Makefile.am
index b1751bd..bee52cb 100644
--- a/libview/Makefile.am
+++ b/libview/Makefile.am
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libevview3.la
 
-NOINST_H_FILES =			\
+NOINST_H_SRC_FILES =			\
 	ev-annotation-window.h		\
 	ev-loading-window.h		\
 	ev-page-cache.h			\
@@ -9,9 +9,11 @@ NOINST_H_FILES =			\
 	ev-transition-animation.h	\
 	ev-view-accessible.h		\
 	ev-view-cursor.h		\
-	ev-view-marshal.h		\
 	ev-view-private.h
 
+NOINST_H_BUILT_FILES = \
+	ev-view-marshal.h
+
 INST_H_SRC_FILES = 			\
 	ev-document-model.h		\
 	ev-jobs.h			\
@@ -21,12 +23,12 @@ INST_H_SRC_FILES = 			\
 	ev-view.h			\
 	ev-view-presentation.h
 
-INST_H_FILES = 				\
-	$(INST_H_SRC_FILES)		\
+INST_H_BUILT_FILES = \
 	ev-view-type-builtins.h
 
 headerdir = $(includedir)/evince/$(EV_API_VERSION)/libview
-header_DATA = $(INST_H_FILES)
+header_DATA = $(INST_H_SRC_FILES)
+nodist_header_DATA = $(INST_H_BUILT_FILES)
 
 libevview3_la_SOURCES =			\
 	ev-annotation-window.c		\
@@ -42,12 +44,16 @@ libevview3_la_SOURCES =			\
 	ev-transition-animation.c	\
 	ev-view.c			\
 	ev-view-accessible.c		\
-	ev-view-marshal.c		\
 	ev-view-cursor.c		\
 	ev-view-presentation.c		\
-	ev-view-type-builtins.c		\
-	$(NOINST_H_FILES)		\
-	$(INST_H_FILES)
+	$(NOINST_H_SRC_FILES)		\
+	$(INST_H_SRC_FILES)
+
+nodist_libevview3_la_SOURCES = \
+	ev-view-marshal.c \
+	ev-view-type-builtins.c \
+	$(NOINST_H_BUILT_FILES) \
+	$(INST_H_BUILT_FILES)
 
 libevview3_la_CPPFLAGS = \
 	-DEVINCEDATADIR=\"$(pkgdatadir)\"	\
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 11361e3..475c891 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -166,6 +166,6 @@ ev-marshal.c: $(srcdir)/ev-marshal.list
 ev-resources.c: evince.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/evince.gresource.xml)
 	$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate-source --c-name ev $<
 
-DISTCLEANFILES =
+DISTCLEANFILES = $(BUILT_SOURCES)
 
 -include $(top_srcdir)/git.mk



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]