[Gnucash-changes] r12347 - gnucash/trunk - Don't install goffice and gsf headers.

Derek Atkins warlord at cvs.gnucash.org
Fri Jan 13 18:57:37 EST 2006


Author: warlord
Date: 2006-01-13 18:57:36 -0500 (Fri, 13 Jan 2006)
New Revision: 12347
Trac: http://svn.gnucash.org/trac/changeset/12347

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/lib/goffice-0.0.4/goffice/Makefile.am
   gnucash/trunk/lib/goffice-0.0.4/goffice/app/Makefile.am
   gnucash/trunk/lib/goffice-0.0.4/goffice/cut-n-paste/foocanvas/Makefile.am
   gnucash/trunk/lib/goffice-0.0.4/goffice/cut-n-paste/pcre/Makefile.am
   gnucash/trunk/lib/goffice-0.0.4/goffice/data/Makefile.am
   gnucash/trunk/lib/goffice-0.0.4/goffice/drawing/Makefile.am
   gnucash/trunk/lib/goffice-0.0.4/goffice/graph/Makefile.am
   gnucash/trunk/lib/goffice-0.0.4/goffice/gtk/Makefile.am
   gnucash/trunk/lib/goffice-0.0.4/goffice/ms-compat/Makefile.am
   gnucash/trunk/lib/goffice-0.0.4/goffice/utils/Makefile.am
   gnucash/trunk/lib/libgsf-1.12.3/gsf-gnome/Makefile.am
   gnucash/trunk/lib/libgsf-1.12.3/gsf-win32/Makefile.am
   gnucash/trunk/lib/libgsf-1.12.3/gsf/Makefile.am
Log:
Don't install goffice and gsf headers.

	* goffice/*/Makefile.am:
	* libgsf/*/Makefile.am:
	  don't install goffice and gsf headers.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-01-13 22:18:31 UTC (rev 12346)
+++ gnucash/trunk/ChangeLog	2006-01-13 23:57:36 UTC (rev 12347)
@@ -10,6 +10,10 @@
 	* src/bin/overrides/Makefile.am:
 	  remove unnecessary override files that are no longer useful.
 
+	* goffice/*/Makefile.am:
+	* libgsf/*/Makefile.am:
+	  don't install goffice and gsf headers.
+
 2006-01-13  Neil Williams <linux at codehelp.co.uk>
 
 	* src/bin/test/test-version : Using Derek's fix to

Modified: gnucash/trunk/lib/goffice-0.0.4/goffice/Makefile.am
===================================================================
--- gnucash/trunk/lib/goffice-0.0.4/goffice/Makefile.am	2006-01-13 22:18:31 UTC (rev 12346)
+++ gnucash/trunk/lib/goffice-0.0.4/goffice/Makefile.am	2006-01-13 23:57:36 UTC (rev 12347)
@@ -32,10 +32,10 @@
 endif
 
 libgoffice_1_ladir = $(goffice_include_dir)
-libgoffice_1_la_HEADERS = 	\
+noinst_HEADERS = 	\
 	goffice.h
 if !HAVE_GLIB26
-  libgoffice_1_la_HEADERS += glib24_26-compat.h
+  noinst_HEADERS += glib24_26-compat.h
 endif
 
 # Depends on this Makefile, because it uses make variables.

Modified: gnucash/trunk/lib/goffice-0.0.4/goffice/app/Makefile.am
===================================================================
--- gnucash/trunk/lib/goffice-0.0.4/goffice/app/Makefile.am	2006-01-13 22:18:31 UTC (rev 12346)
+++ gnucash/trunk/lib/goffice-0.0.4/goffice/app/Makefile.am	2006-01-13 23:57:36 UTC (rev 12347)
@@ -19,7 +19,7 @@
 	go-cmd-context.c
 
 libgoffice_app_ladir = $(goffice_include_dir)/app
-libgoffice_app_la_HEADERS = 	\
+noinst_HEADERS += 	\
 	goffice-app.h			\
 	\
 	go-doc.h 			\

Modified: gnucash/trunk/lib/goffice-0.0.4/goffice/cut-n-paste/foocanvas/Makefile.am
===================================================================
--- gnucash/trunk/lib/goffice-0.0.4/goffice/cut-n-paste/foocanvas/Makefile.am	2006-01-13 22:18:31 UTC (rev 12346)
+++ gnucash/trunk/lib/goffice-0.0.4/goffice/cut-n-paste/foocanvas/Makefile.am	2006-01-13 23:57:36 UTC (rev 12347)
@@ -21,7 +21,7 @@
 
 libfoocanvasincludedir = $(includedir)/libgoffice-1/goffice/cut-n-paste/foocanvas/
 
-libfoocanvasinclude_HEADERS =			\
+noinst_HEADERS =			\
 	foo-canvas-line.h			\
 	foo-canvas-pixbuf.h			\
 	foo-canvas-polygon.h			\
@@ -33,7 +33,6 @@
 	libfoocanvas.h
 
 libfoocanvas_la_SOURCES =			\
-	$(libfoocanvasinclude_HEADERS)		\
 	foo-canvas-marshal.list			\
 	foo-canvas-i18n.h			\
 	foo-canvas-line.c			\

Modified: gnucash/trunk/lib/goffice-0.0.4/goffice/cut-n-paste/pcre/Makefile.am
===================================================================
--- gnucash/trunk/lib/goffice-0.0.4/goffice/cut-n-paste/pcre/Makefile.am	2006-01-13 22:18:31 UTC (rev 12346)
+++ gnucash/trunk/lib/goffice-0.0.4/goffice/cut-n-paste/pcre/Makefile.am	2006-01-13 23:57:36 UTC (rev 12347)
@@ -3,8 +3,8 @@
 EXTRA_DIST = COPYING
 
 libpcre_a_ladir = $(includedir)/libgoffice-1/goffice/cut-n-paste/pcre
-libpcre_a_la_HEADERS = pcreposix.h
-noinst_HEADERS = internal.h pcre.h
+noinst_HEADERS = pcreposix.h
+noinst_HEADERS += internal.h pcre.h
 
 AM_CPPFLAGS = \
 	$(GOFFICE_DEPS_CFLAGS) \

Modified: gnucash/trunk/lib/goffice-0.0.4/goffice/data/Makefile.am
===================================================================
--- gnucash/trunk/lib/goffice-0.0.4/goffice/data/Makefile.am	2006-01-13 22:18:31 UTC (rev 12346)
+++ gnucash/trunk/lib/goffice-0.0.4/goffice/data/Makefile.am	2006-01-13 23:57:36 UTC (rev 12347)
@@ -5,7 +5,7 @@
 	go-data-simple.c
 
 libgoffice_data_ladir = $(goffice_include_dir)/data
-libgoffice_data_la_HEADERS = 	\
+noinst_HEADERS = 	\
 	goffice-data.h		\
 	go-data.h 		\
 	go-data-impl.h 		\

Modified: gnucash/trunk/lib/goffice-0.0.4/goffice/drawing/Makefile.am
===================================================================
--- gnucash/trunk/lib/goffice-0.0.4/goffice/drawing/Makefile.am	2006-01-13 22:18:31 UTC (rev 12346)
+++ gnucash/trunk/lib/goffice-0.0.4/goffice/drawing/Makefile.am	2006-01-13 23:57:36 UTC (rev 12347)
@@ -15,7 +15,7 @@
 	god-text-model.c
 
 libgoffice_drawing_ladir = $(goffice_include_dir)/drawing
-libgoffice_drawing_la_HEADERS = 	\
+noinst_HEADERS = 	\
 	god-anchor.h			\
 	god-default-attributes.h	\
 	god-drawing-group.h		\

Modified: gnucash/trunk/lib/goffice-0.0.4/goffice/graph/Makefile.am
===================================================================
--- gnucash/trunk/lib/goffice-0.0.4/goffice/graph/Makefile.am	2006-01-13 22:18:31 UTC (rev 12346)
+++ gnucash/trunk/lib/goffice-0.0.4/goffice/graph/Makefile.am	2006-01-13 23:57:36 UTC (rev 12347)
@@ -37,7 +37,7 @@
 	gog-renderer-svg.c
 
 libgoffice_graph_ladir = $(goffice_include_dir)/graph
-libgoffice_graph_la_HEADERS = \
+noinst_HEADERS = \
 	goffice-graph.h			\
 	gog-object.h			\
 	gog-object-xml.h		\

Modified: gnucash/trunk/lib/goffice-0.0.4/goffice/gtk/Makefile.am
===================================================================
--- gnucash/trunk/lib/goffice-0.0.4/goffice/gtk/Makefile.am	2006-01-13 22:18:31 UTC (rev 12346)
+++ gnucash/trunk/lib/goffice-0.0.4/goffice/gtk/Makefile.am	2006-01-13 23:57:36 UTC (rev 12347)
@@ -26,7 +26,7 @@
 
 
 libgoffice_gtk_ladir = $(goffice_include_dir)/gtk
-libgoffice_gtk_la_HEADERS = 		\
+noinst_HEADERS = 		\
 	goffice-gtk.h			\
 	\
 	go-font-sel.h			\

Modified: gnucash/trunk/lib/goffice-0.0.4/goffice/ms-compat/Makefile.am
===================================================================
--- gnucash/trunk/lib/goffice-0.0.4/goffice/ms-compat/Makefile.am	2006-01-13 22:18:31 UTC (rev 12346)
+++ gnucash/trunk/lib/goffice-0.0.4/goffice/ms-compat/Makefile.am	2006-01-13 23:57:36 UTC (rev 12347)
@@ -7,7 +7,7 @@
 	go-ms-parser.c
 
 libgoffice_ms_compat_ladir = $(goffice_include_dir)/ms-compat
-libgoffice_ms_compat_la_HEADERS = 	\
+noinst_HEADERS = 	\
 	god-drawing-ms-client-handler.h	\
 	god-drawing-ms.h		\
 	god-image-ms.h			\

Modified: gnucash/trunk/lib/goffice-0.0.4/goffice/utils/Makefile.am
===================================================================
--- gnucash/trunk/lib/goffice-0.0.4/goffice/utils/Makefile.am	2006-01-13 22:18:31 UTC (rev 12346)
+++ gnucash/trunk/lib/goffice-0.0.4/goffice/utils/Makefile.am	2006-01-13 23:57:36 UTC (rev 12347)
@@ -37,7 +37,7 @@
 	go-regression.c
 
 libgoffice_utils_ladir = $(goffice_include_dir)/utils
-libgoffice_utils_la_HEADERS = 	\
+noinst_HEADERS = 	\
 	goffice-utils.h		\
 	go-color.h		\
 	go-file.h		\

Modified: gnucash/trunk/lib/libgsf-1.12.3/gsf/Makefile.am
===================================================================
--- gnucash/trunk/lib/libgsf-1.12.3/gsf/Makefile.am	2006-01-13 22:18:31 UTC (rev 12346)
+++ gnucash/trunk/lib/libgsf-1.12.3/gsf/Makefile.am	2006-01-13 23:57:36 UTC (rev 12347)
@@ -75,7 +75,7 @@
 endif
 
 libgsf_1_includedir = $(includedir)/libgsf-1/gsf
-libgsf_1_include_HEADERS = 	\
+noinst_HEADERS = 	\
 	gsf.h			\
 	gsf-utils.h		\
 	gsf-libxml.h		\
@@ -126,7 +126,7 @@
 #	gsf-io-context.h
 
 if !HAVE_GLIB26
-  libgsf_1_include_HEADERS += glib24_26-compat.h
+  noinst_HEADERS += glib24_26-compat.h
 endif
 
 install-data-local: install-libtool-import-lib

Modified: gnucash/trunk/lib/libgsf-1.12.3/gsf-gnome/Makefile.am
===================================================================
--- gnucash/trunk/lib/libgsf-1.12.3/gsf-gnome/Makefile.am	2006-01-13 22:18:31 UTC (rev 12346)
+++ gnucash/trunk/lib/libgsf-1.12.3/gsf-gnome/Makefile.am	2006-01-13 23:57:36 UTC (rev 12347)
@@ -19,7 +19,7 @@
 
 ## But headers are installed always:
 libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome
-libgsf_gnome_1_include_HEADERS =  \
+noinst_HEADERS =  \
 	gsf-input-gnomevfs.h	\
 	gsf-output-gnomevfs.h	\
 	gsf-input-bonobo.h 	\

Modified: gnucash/trunk/lib/libgsf-1.12.3/gsf-win32/Makefile.am
===================================================================
--- gnucash/trunk/lib/libgsf-1.12.3/gsf-win32/Makefile.am	2006-01-13 22:18:31 UTC (rev 12346)
+++ gnucash/trunk/lib/libgsf-1.12.3/gsf-win32/Makefile.am	2006-01-13 23:57:36 UTC (rev 12347)
@@ -14,6 +14,6 @@
 
 ## But headers are installed on all systems:
 libgsf_win32_1_includedir = $(includedir)/libgsf-1/gsf-win32
-libgsf_win32_1_include_HEADERS =  \
+noinst_HEADERS =  \
 	gsf-input-win32.h	\
 	gsf-output-win32.h



More information about the gnucash-changes mailing list