Some makefile cleanup.

	* Makefile.am: Don't build intl since we don't need it the way we
	use gettext.
	* applets/launcher/Makefile.am: Remove redundant -I$(srcdir).
	* applets/preferences-applet/Makefile.am: Remove redundant
	-I$(srcdir).
	* components/adapter/Makefile.am: Remove redundant -I.
	* components/mozilla/Makefile.am: Mark private headers as SOURCES,
	not noinst_HEADERS, as suggested by automake book and manual.
	* components/news/Makefile.am: Remove unneeded
	-I$(top_srcdir)/components/news.
	* configure.in: Don't build intl since we don't need it the way we
	use gettext.
	* libnautilus-adapter/Makefile.am: Remove redundant -I.
	* libnautilus-private/Makefile.am: Change -I for new
	cut-n-paste-code scheme. Also mark private headers as SOURCES, not
	noinst_HEADERS, as suggested by automake book and manual.
	* libnautilus/Makefile.am: Remove redundant -I.
	* src/Makefile.am: Change -I for new cut-n-paste-code scheme. Also
	mark private headers as SOURCES, not noinst_HEADERS, as suggested
	by automake book and manual.
	* src/file-manager/Makefile.am: Mark private headers as SOURCES,
	not noinst_HEADERS, as suggested by automake book and manual.

	* check-THANKS.pl: Change Seth's preferred email address.

	* cut-n-paste-code/widgets/e-paned/Makefile.am:
	* cut-n-paste-code/widgets/gimphwrapbox/Makefile.am:
	Don't use -static, since we plan to link
	Remove unneeded -I directives now that we handle includes
	differently. Also mark private headers as SOURCES, not
	noinst_HEADERS, as suggested by automake book and manual.

	* cut-n-paste-code/widgets/e-paned/e-hpaned.h:
	* cut-n-paste-code/widgets/e-paned/e-vpaned.h:
	* libnautilus-private/nautilus-horizontal-splitter.h:
	* src/nautilus-complex-search-bar.c:
	* src/nautilus-search-bar-criterion.c:
	Simpler include scheme for cut-n-paste code.

4 files changed, 2 insertions, 16 deletions

diff --git a/cut-n-paste-code/widgets/e-paned/Makefile.am b/cut-n-paste-code/widgets/e-paned/Makefile.am
index 48bc02d4b..d016f8ff7 100644
--- a/cut-n-paste-code/widgets/e-paned/Makefile.am
+++ b/cut-n-paste-code/widgets/e-paned/Makefile.am
@@ -3,20 +3,13 @@ NULL=
 noinst_LTLIBRARIES = libe-paned.la
 
 INCLUDES = \
-	-I$(top_srcdir)/cut-n-paste-code \
 	$(GNOMEUI_CFLAGS) \
 	$(NULL)
 
-libe_paned_la_LDFLAGS = -static
-
 libe_paned_la_SOURCES = \
 	e-hpaned.c \
 	e-paned.c \
 	e-vpaned.c \
-	$(NULL)
-
-# Everything is private for now
-noinst_HEADERS =\
 	e-hpaned.h \
 	e-paned.h \
 	e-vpaned.h \
diff --git a/cut-n-paste-code/widgets/e-paned/e-hpaned.h b/cut-n-paste-code/widgets/e-paned/e-hpaned.h
index 63c09198b..8832cf107 100644
--- a/cut-n-paste-code/widgets/e-paned/e-hpaned.h
+++ b/cut-n-paste-code/widgets/e-paned/e-hpaned.h
@@ -35,7 +35,7 @@
 #ifndef __E_HPANED_H__
 #define __E_HPANED_H__
 
-#include <widgets/e-paned/e-paned.h>
+#include "e-paned.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cut-n-paste-code/widgets/e-paned/e-vpaned.h b/cut-n-paste-code/widgets/e-paned/e-vpaned.h
index 1c247472f..fbd18e8ea 100644
--- a/cut-n-paste-code/widgets/e-paned/e-vpaned.h
+++ b/cut-n-paste-code/widgets/e-paned/e-vpaned.h
@@ -35,7 +35,7 @@
 #ifndef __E_VPANED_H__
 #define __E_VPANED_H__
 
-#include <widgets/e-paned/e-paned.h>
+#include "e-paned.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cut-n-paste-code/widgets/gimphwrapbox/Makefile.am b/cut-n-paste-code/widgets/gimphwrapbox/Makefile.am
index 023366e17..1c67601d8 100644
--- a/cut-n-paste-code/widgets/gimphwrapbox/Makefile.am
+++ b/cut-n-paste-code/widgets/gimphwrapbox/Makefile.am
@@ -3,19 +3,12 @@ NULL=
 noinst_LTLIBRARIES = libgtkhwrapbox.la
 
 INCLUDES = \
-	-I$(top_srcdir)/cut-n-paste-code \
 	$(GNOMEUI_CFLAGS) \
 	$(NULL)
 
-libgtkhwrapbox_la_LDFLAGS = -static
-
 libgtkhwrapbox_la_SOURCES = \
 	gtkhwrapbox.c \
 	gtkwrapbox.c \
-	$(NULL)
-
-# Everything is private for now
-noinst_HEADERS =\
 	gtkhwrapbox.h \
 	gtkwrapbox.h \
 	$(NULL)