From 639749bcd37f6694a5b951e5dfce572196bf692b Mon Sep 17 00:00:00 2001 From: Darin Adler Date: Fri, 1 Dec 2000 02:30:15 +0000 Subject: Ran check-headers-in-Makefile since we had some problems with that lately. I guess the Tinderbox is the new way to catch these problems but I couldn't resist fixing them the old way too. * check-headers-in-Makefile.pl: Added some more special cases in here to make it work better. * components/services/install/nautilus-view/Makefile.am: Marked the unused files in here as "noinst_HEADERS" as a hack to make the script happy. We should delete the files at some point if we decide we aren't ever using them. * components/loser/content/.cvsignore: * components/loser/sidebar/.cvsignore: * components/mozilla/.cvsignore: * components/sample/.cvsignore: * components/services/install/command-line/.cvsignore: * libnautilus/.cvsignore: * src/.cvsignore: * src/file-manager/.cvsignore: Removed all the .xml.h files because they aren't put in these directories any more so they don't need to be ignored. If you have the files still and the cvs warnings bother you, you can delete them. --- ChangeLog | 30 +++++++++++++++++++++- check-headers-in-Makefile.pl | 2 ++ components/loser/content/.cvsignore | 1 - components/loser/sidebar/.cvsignore | 1 - components/mozilla/.cvsignore | 2 -- components/sample/.cvsignore | 2 -- components/services/install-view/Makefile.am | 7 ++++- .../services/install/command-line/.cvsignore | 6 +---- .../services/install/nautilus-view/Makefile.am | 7 ++++- libnautilus/.cvsignore | 1 - src/.cvsignore | 2 -- src/file-manager/.cvsignore | 3 --- 12 files changed, 44 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58d59ba43..577dc2204 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2000-11-30 Darin Adler + + Ran check-headers-in-Makefile since we had some problems + with that lately. I guess the Tinderbox is the new way to + catch these problems but I couldn't resist fixing them + the old way too. + + * check-headers-in-Makefile.pl: Added some more special cases + in here to make it work better. + + * components/services/install/nautilus-view/Makefile.am: + Marked the unused files in here as "noinst_HEADERS" as a hack + to make the script happy. We should delete the files at some + point if we decide we aren't ever using them. + + * components/loser/content/.cvsignore: + * components/loser/sidebar/.cvsignore: + * components/mozilla/.cvsignore: + * components/sample/.cvsignore: + * components/services/install/command-line/.cvsignore: + * libnautilus/.cvsignore: + * src/.cvsignore: + * src/file-manager/.cvsignore: + Removed all the .xml.h files because they aren't put in these + directories any more so they don't need to be ignored. If you + have the files still and the cvs warnings bother you, you can + delete them. + 2000-11-30 Andy Hertzfeld * components/image-viewer/nautilus-image-view.c: @@ -202,7 +230,7 @@ isn't updated when text changes) by implementing forgetting of file attributes and using it when appropriate. - Also fixed various other bugs cought by testing of these fixes or + Also fixed various other bugs caught by testing of these fixes or reading the code. * libnautilus-extensions/nautilus-file.c: diff --git a/check-headers-in-Makefile.pl b/check-headers-in-Makefile.pl index 3c41f5c20..ed6694cc2 100755 --- a/check-headers-in-Makefile.pl +++ b/check-headers-in-Makefile.pl @@ -33,7 +33,9 @@ my @directories = ("."); my %exceptions = ( + '$(APPLETS_SUBDIRS)' => 'applets', '$(AUTHENTICATE_HELPER_SUBDIRS)' => 'authenticate', + '$(INSTALL_SERVICE)' => 'install', '$(MOZILLA_COMPONENT_SUBDIRS)' => 'mozilla', '$(NULL)' => '', '$(RPMVIEW_COMPONENT_SUBDIRS)' => 'rpmview', diff --git a/components/loser/content/.cvsignore b/components/loser/content/.cvsignore index adb3fc7da..c4132b841 100644 --- a/components/loser/content/.cvsignore +++ b/components/loser/content/.cvsignore @@ -3,4 +3,3 @@ Makefile Makefile.in nautilus-content-loser -nautilus-content-loser-ui.xml.h diff --git a/components/loser/sidebar/.cvsignore b/components/loser/sidebar/.cvsignore index 9d76a6d15..8ff625658 100644 --- a/components/loser/sidebar/.cvsignore +++ b/components/loser/sidebar/.cvsignore @@ -3,4 +3,3 @@ Makefile Makefile.in nautilus-sidebar-loser -nautilus-sidebar-loser-ui.xml.h diff --git a/components/mozilla/.cvsignore b/components/mozilla/.cvsignore index b156000b0..1433b00d0 100644 --- a/components/mozilla/.cvsignore +++ b/components/mozilla/.cvsignore @@ -3,5 +3,3 @@ Makefile Makefile.in nautilus-mozilla-content-view -nautilus-mozilla-ui.xml.h - diff --git a/components/sample/.cvsignore b/components/sample/.cvsignore index f4cc5e3e8..0f0390c22 100644 --- a/components/sample/.cvsignore +++ b/components/sample/.cvsignore @@ -3,5 +3,3 @@ Makefile Makefile.in nautilus-sample-content-view -nautilus-sample-content-view-ui.xml.h - diff --git a/components/services/install-view/Makefile.am b/components/services/install-view/Makefile.am index 59b02f042..62f932ce3 100644 --- a/components/services/install-view/Makefile.am +++ b/components/services/install-view/Makefile.am @@ -26,8 +26,13 @@ oaf_DATA = nautilus-service-install-view.oafinfo bin_PROGRAMS = nautilus-service-install-view -nautilus_service_install_view_SOURCES = \ +noinst_HEADERS = \ + nautilus-service-install.c \ + nautilus-service-install.h \ nautilus-service-install-view.h \ + $(NULL) + +nautilus_service_install_view_SOURCES = \ nautilus-service-install-view.c \ main.c \ $(NULL) diff --git a/components/services/install/command-line/.cvsignore b/components/services/install/command-line/.cvsignore index 6b1c94873..7d2e56ac0 100644 --- a/components/services/install/command-line/.cvsignore +++ b/components/services/install/command-line/.cvsignore @@ -2,11 +2,7 @@ .libs Makefile Makefile.in -eazel-alt-install eazel-gen-xml eazel-install -eazel-package-query -eazel-query -eazel-revert -eazel-uninstall +eazel-test-packsys package-list.xml* diff --git a/components/services/install/nautilus-view/Makefile.am b/components/services/install/nautilus-view/Makefile.am index 59b02f042..62f932ce3 100644 --- a/components/services/install/nautilus-view/Makefile.am +++ b/components/services/install/nautilus-view/Makefile.am @@ -26,8 +26,13 @@ oaf_DATA = nautilus-service-install-view.oafinfo bin_PROGRAMS = nautilus-service-install-view -nautilus_service_install_view_SOURCES = \ +noinst_HEADERS = \ + nautilus-service-install.c \ + nautilus-service-install.h \ nautilus-service-install-view.h \ + $(NULL) + +nautilus_service_install_view_SOURCES = \ nautilus-service-install-view.c \ main.c \ $(NULL) diff --git a/libnautilus/.cvsignore b/libnautilus/.cvsignore index 2802f9ce7..41608c2b5 100644 --- a/libnautilus/.cvsignore +++ b/libnautilus/.cvsignore @@ -14,4 +14,3 @@ nautilus-view-component-stubs.c nautilus-view-component.h nautilus_distributed_undo_idl_stamp nautilus_view_component_idl_stamp -nautilus-clipboard-ui.xml.h diff --git a/src/.cvsignore b/src/.cvsignore index 8a8c40594..c8c97c5ef 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -8,5 +8,3 @@ nautilus-shell-interface-skels.c nautilus-shell-interface-stubs.c nautilus-shell-interface.h nautilus_shell_interface_idl_stamp -nautilus-shell-ui.xml.h - diff --git a/src/file-manager/.cvsignore b/src/file-manager/.cvsignore index 72060d8e5..62535c77d 100644 --- a/src/file-manager/.cvsignore +++ b/src/file-manager/.cvsignore @@ -4,6 +4,3 @@ *.lo Makefile Makefile.in -nautilus-directory-view-ui.xml.h -nautilus-icon-view-ui.xml.h -nautilus-search-list-view-ui.xml.h \ No newline at end of file -- cgit v1.2.1