From 097991a9d017975f4a02871e419d97ed700eafd6 Mon Sep 17 00:00:00 2001
From: Darin Adler <darin@src.gnome.org>
Date: Thu, 1 Nov 2001 01:24:25 +0000
Subject: Removed nautilus-config and nautilusConf.sh stuff. Get rid of
 applets,

	* configure.in:
	* Makefile.am:
	Removed nautilus-config and nautilusConf.sh stuff.
	Get rid of applets, helper-scripts, and helper-utilities.
	Compile user-guide, help, and omf-install.

	* applets/
	* helper-scripts/
	* helper-utilities/
	Removed.

	* src/Nautilus_shell.oaf.in: Renamed to .server.in.
	* src/.cvsignore: Ignore the new .server.

	* src/nautilus-view-frame.c: Add missing include.

	* src/nautilus-window.c: (nautilus_window_allow_stop):
	Put code in #if GNOME2_CONVERSION_COMPLETE.
---
 Makefile.am | 57 +++------------------------------------------------------
 1 file changed, 3 insertions(+), 54 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index c1a64340f..204778096 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,10 +5,6 @@ include $(top_srcdir)/Makefile.shared
 DESKTOP_IN_FILES=nautilus.desktop.in nautilus-help.desktop.in
 DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop)
 
-if HAVE_APPLETS
-APPLETS_SUBDIRS = applets
-endif
-
 SUBDIRS =			\
 	libnautilus 		\
 	libnautilus-private 	\
@@ -18,17 +14,14 @@ SUBDIRS =			\
 	po 			\
 	data 			\
 	icons 			\
+	user-guide		\
+	help			\
+	omf-install		\
 	$(NULL)
 
 XXX = \
 	components		\
-	helper-utilities 	\
-	helper-scripts		\
-	$(APPLETS_SUBDIRS)	\
 	test 			\
-	user-guide		\
-	help			\
-	omf-install		\
 	$(NULL)
 
 EXTRA_DIST=					\
@@ -70,53 +63,9 @@ Applications_DATA = $(DESKTOP_FILES)
 Toplevelmenudir = $(datadir)/gnome/apps
 Toplevelmenu_DATA = nautilus-help.desktop
 
-## [The following is shamelessly copied from gnome-vfs.]
-
-## We create `nautilusConf.sh' here and not from configure because we
-## want to get the paths expanded correctly.  Macros like srcdir are
-## given the value NONE in configure if the user doesn't specify them
-## (this is an autoconf feature, not a bug).
-
-bin_SCRIPTS = $(top_builddir)/nautilus-config
-
-confexecdir=$(libdir)
-confexec_DATA =					\
-	nautilusConf.sh				\
-	$(NULL)
-
-nautilusConf.sh: nautilusConf.sh.in Makefile
-	sed -e 's?\@NAUTILUS_LIBDIR\@?$(NAUTILUS_LIBDIR)?g' \
-	    -e 's?\@NAUTILUS_INCLUDEDIR\@?$(NAUTILUS_INCLUDEDIR)?g' \
-	    -e 's?\@VERSION\@?$(VERSION)?g' \
-	    -e 's?\@NAUTILUS_LIBS\@?$(NAUTILUS_LIBS)?g' \
-	      < $(srcdir)/nautilusConf.sh.in > nautilusConf.tmp \
-	  && mv nautilusConf.tmp nautilusConf.sh
-
-nautilus-config: nautilus-config.in Makefile
-	sed -e 's?\@LIBDIR\@?$(libdir)?g' \
-	    -e 's?\@NAUTIlUS_LIBDIR\@?$(NAUTILUS_LIBDIR)?g' \
-	    -e 's?\@NAUTILUS_INCLUDEDIR\@?$(NAUTILUS_INCLUDEDIR)?g' \
-	    -e 's?\@VERSION\@?$(VERSION)?g' \
-	    -e 's?\@NAUTILUS_LIBS\@?$(NAUTILUS_LIBS)?g' \
-	      < $(srcdir)/nautilus-config.in > nautilus-config.tmp \
-	  && mv nautilus-config.tmp nautilus-config && \
-		chmod 755 nautilus-config
-
-##################################################################
-#
-# dist-hook
-#
-##################################################################
-
 dist-hook: nautilus.spec
 	cp nautilus.spec $(distdir)
 
-##################################################################
-#
-# install-data-hook
-#
-##################################################################
-
 install-data-hook: nautilus-clean.sh
 	$(mkinstalldirs) $(DESTDIR)$(prefix)/bin
 	@list='nautilus-clean.sh'; for p in $$list; do\
-- 
cgit v1.2.1