diff options
author | Alexander Larsson <alexl@redhat.com> | 2005-12-12 18:37:44 +0000 |
---|---|---|
committer | Alexander Larsson <alexl@src.gnome.org> | 2005-12-12 18:37:44 +0000 |
commit | a2971f6f97c50c0e1a188a0cc48b5418c4512133 (patch) | |
tree | 8f068869333e93773f4584ef0a4c98cc85f6d833 | |
parent | 4e9a462a3662b26598ae05cf779cae9381dedbc3 (diff) | |
download | nautilus-a2971f6f97c50c0e1a188a0cc48b5418c4512133.tar.gz |
disable update-mimedb in distcheckNAUTILUS_2_13_3
2005-12-12 Alexander Larsson <alexl@redhat.com>
* Makefile.am:
disable update-mimedb in distcheck
* libnautilus-private/Makefile.am:
Add beagle sources to extradist
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | libnautilus-private/Makefile.am | 9 |
3 files changed, 15 insertions, 4 deletions
@@ -1,5 +1,11 @@ 2005-12-12 Alexander Larsson <alexl@redhat.com> - + + * Makefile.am: + disable update-mimedb in distcheck + + * libnautilus-private/Makefile.am: + Add beagle sources to extradist + * NEWS: Update for release diff --git a/Makefile.am b/Makefile.am index b400bf4a8..6f1a2673d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,3 +51,5 @@ DISTCLEANFILES = \ intltool-extract \ intltool-merge \ intltool-update + +DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am index d01102961..7535c2c87 100644 --- a/libnautilus-private/Makefile.am +++ b/libnautilus-private/Makefile.am @@ -203,10 +203,12 @@ libnautilus_private_la_SOURCES = \ nautilus-window-info.h \ $(NULL) -if HAVE_BEAGLE -libnautilus_private_la_SOURCES += \ - nautilus-search-engine-beagle.c +BEAGLE_SOURCES = \ + nautilus-search-engine-beagle.c \ nautilus-search-engine-beagle.h + +if HAVE_BEAGLE +libnautilus_private_la_SOURCES += $(BEAGLE_SOURCES) endif $(lib_LTLIBRARIES): $(dependency_static_libs) @@ -244,6 +246,7 @@ EXTRA_DIST = \ nautilus-metafile-server.idl \ nautilus-marshal.list \ $(schema_in_files) \ + $(BEAGLE_SOURCES) \ $(NULL) CLEANFILES = \ |