diff --git a/ChangeLog b/ChangeLog index b560833b92..83f58712a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 * src/bin/test/test-version : Using Derek's fix to diff --git a/lib/goffice-0.0.4/goffice/Makefile.am b/lib/goffice-0.0.4/goffice/Makefile.am index d5fd17a148..90a8e8bcbd 100644 --- a/lib/goffice-0.0.4/goffice/Makefile.am +++ b/lib/goffice-0.0.4/goffice/Makefile.am @@ -32,10 +32,10 @@ if !HAVE_GLIB26 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. diff --git a/lib/goffice-0.0.4/goffice/app/Makefile.am b/lib/goffice-0.0.4/goffice/app/Makefile.am index e3ee660aec..6a515d0a11 100644 --- a/lib/goffice-0.0.4/goffice/app/Makefile.am +++ b/lib/goffice-0.0.4/goffice/app/Makefile.am @@ -19,7 +19,7 @@ libgoffice_app_la_SOURCES = \ go-cmd-context.c libgoffice_app_ladir = $(goffice_include_dir)/app -libgoffice_app_la_HEADERS = \ +noinst_HEADERS += \ goffice-app.h \ \ go-doc.h \ diff --git a/lib/goffice-0.0.4/goffice/cut-n-paste/foocanvas/Makefile.am b/lib/goffice-0.0.4/goffice/cut-n-paste/foocanvas/Makefile.am index c07430fdd9..ed8df7254a 100644 --- a/lib/goffice-0.0.4/goffice/cut-n-paste/foocanvas/Makefile.am +++ b/lib/goffice-0.0.4/goffice/cut-n-paste/foocanvas/Makefile.am @@ -21,7 +21,7 @@ libfoocanvas_la_LIBADD = \ 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 @@ libfoocanvasinclude_HEADERS = \ libfoocanvas.h libfoocanvas_la_SOURCES = \ - $(libfoocanvasinclude_HEADERS) \ foo-canvas-marshal.list \ foo-canvas-i18n.h \ foo-canvas-line.c \ diff --git a/lib/goffice-0.0.4/goffice/cut-n-paste/pcre/Makefile.am b/lib/goffice-0.0.4/goffice/cut-n-paste/pcre/Makefile.am index 5f8288d09e..32b265a17a 100644 --- a/lib/goffice-0.0.4/goffice/cut-n-paste/pcre/Makefile.am +++ b/lib/goffice-0.0.4/goffice/cut-n-paste/pcre/Makefile.am @@ -3,8 +3,8 @@ libpcre_la_SOURCES = maketables.c get.c study.c pcre.c pcreposix.c 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) \ diff --git a/lib/goffice-0.0.4/goffice/data/Makefile.am b/lib/goffice-0.0.4/goffice/data/Makefile.am index 6f51008d7f..55e57ba9cb 100644 --- a/lib/goffice-0.0.4/goffice/data/Makefile.am +++ b/lib/goffice-0.0.4/goffice/data/Makefile.am @@ -5,7 +5,7 @@ libgoffice_data_la_SOURCES = \ 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 \ diff --git a/lib/goffice-0.0.4/goffice/drawing/Makefile.am b/lib/goffice-0.0.4/goffice/drawing/Makefile.am index 24170c25f0..35569b3f4f 100644 --- a/lib/goffice-0.0.4/goffice/drawing/Makefile.am +++ b/lib/goffice-0.0.4/goffice/drawing/Makefile.am @@ -15,7 +15,7 @@ libgoffice_drawing_la_SOURCES = \ 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 \ diff --git a/lib/goffice-0.0.4/goffice/graph/Makefile.am b/lib/goffice-0.0.4/goffice/graph/Makefile.am index 7f18b63c57..6d7102c50e 100644 --- a/lib/goffice-0.0.4/goffice/graph/Makefile.am +++ b/lib/goffice-0.0.4/goffice/graph/Makefile.am @@ -37,7 +37,7 @@ libgoffice_graph_la_SOURCES = \ 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 \ diff --git a/lib/goffice-0.0.4/goffice/gtk/Makefile.am b/lib/goffice-0.0.4/goffice/gtk/Makefile.am index b62bbd66c7..81ce6d896c 100644 --- a/lib/goffice-0.0.4/goffice/gtk/Makefile.am +++ b/lib/goffice-0.0.4/goffice/gtk/Makefile.am @@ -26,7 +26,7 @@ libgoffice_gtk_la_SOURCES = \ libgoffice_gtk_ladir = $(goffice_include_dir)/gtk -libgoffice_gtk_la_HEADERS = \ +noinst_HEADERS = \ goffice-gtk.h \ \ go-font-sel.h \ diff --git a/lib/goffice-0.0.4/goffice/ms-compat/Makefile.am b/lib/goffice-0.0.4/goffice/ms-compat/Makefile.am index 07ec9715a6..ecb88cfdca 100644 --- a/lib/goffice-0.0.4/goffice/ms-compat/Makefile.am +++ b/lib/goffice-0.0.4/goffice/ms-compat/Makefile.am @@ -7,7 +7,7 @@ libgoffice_ms_compat_la_SOURCES = \ 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 \ diff --git a/lib/goffice-0.0.4/goffice/utils/Makefile.am b/lib/goffice-0.0.4/goffice/utils/Makefile.am index 6924628c05..f7cf618e1e 100644 --- a/lib/goffice-0.0.4/goffice/utils/Makefile.am +++ b/lib/goffice-0.0.4/goffice/utils/Makefile.am @@ -37,7 +37,7 @@ libgoffice_utils_la_SOURCES = \ 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 \ diff --git a/lib/libgsf-1.12.3/gsf-gnome/Makefile.am b/lib/libgsf-1.12.3/gsf-gnome/Makefile.am index df8fe6a642..6cd0e7cdac 100644 --- a/lib/libgsf-1.12.3/gsf-gnome/Makefile.am +++ b/lib/libgsf-1.12.3/gsf-gnome/Makefile.am @@ -19,7 +19,7 @@ endif ## 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 \ diff --git a/lib/libgsf-1.12.3/gsf-win32/Makefile.am b/lib/libgsf-1.12.3/gsf-win32/Makefile.am index f6c6a18f14..a5785f3c98 100644 --- a/lib/libgsf-1.12.3/gsf-win32/Makefile.am +++ b/lib/libgsf-1.12.3/gsf-win32/Makefile.am @@ -14,6 +14,6 @@ endif ## 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 diff --git a/lib/libgsf-1.12.3/gsf/Makefile.am b/lib/libgsf-1.12.3/gsf/Makefile.am index ab8dd0e2d6..0dd3319e8e 100644 --- a/lib/libgsf-1.12.3/gsf/Makefile.am +++ b/lib/libgsf-1.12.3/gsf/Makefile.am @@ -75,7 +75,7 @@ if !HAVE_GLIB26 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 @@ libgsf_1_include_HEADERS = \ # 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