From 86af19af06249a519a253a5016b08e0af607ff86 Mon Sep 17 00:00:00 2001
From: Eric Fischer <eric@src.gnome.org>
Date: Wed, 21 Feb 2001 18:26:05 +0000
Subject: Use ln without -s to make links into the real install/lib directory;
 add

	* nautilus-installer/install-lib/Makefile.am:
	Use ln without -s to make links into the real install/lib directory;
	add header file prerequisites

	* nautilus-installer/libtrilobite/Makefile.am:
	Use ln without -s to make links into the real libtrilobite directory;
	fix header file prerequisites

	* nautilus.spec.in:
	Again, try to build the installer in tinderbox.  With luck, it'll
	actually work this time.
---
 nautilus-installer/install-lib/Makefile.am  | 29 +++++++++++++++++++++---
 nautilus-installer/libtrilobite/Makefile.am | 34 +++++++++++++++--------------
 2 files changed, 44 insertions(+), 19 deletions(-)

(limited to 'nautilus-installer')

diff --git a/nautilus-installer/install-lib/Makefile.am b/nautilus-installer/install-lib/Makefile.am
index c717e514c..fd009e225 100644
--- a/nautilus-installer/install-lib/Makefile.am
+++ b/nautilus-installer/install-lib/Makefile.am
@@ -29,15 +29,38 @@ INCLUDES=\
 	-I@top_srcdir@						\
 	-I/usr/include/rpm					\
         -I@top_srcdir@/components/services/trilobite		\
+        -I@top_srcdir@/components/services/trilobite/libtrilobite	\
+        -I@top_srcdir@/components/services/install/lib		\
 	@GNOME_CFLAGS@						\
 	@GCONF_CFLAGS@						\
 	@XML_CFLAGS@						\
 	@GHTTP_CFLAGS@						\
 	$(NULL)
 
-$(libeazelinstall_minimal_a_SOURCES):
-	for i in $(top_srcdir)/components/services/install/lib/*.[ch]; \
-	do bn=`basename $$i`; rm -f $$bn; ln -s $$i $$bn; done
+TRILOBITE_HDRS =  \
+	libtrilobite.h \
+	libtrilobite-service.h \
+	trilobite-core-distribution.h \
+	trilobite-core-messaging.h \
+	trilobite-core-network.h \
+	trilobite-core-utils.h \
+	trilobite-file-utilities.h \
+	trilobite-md5-tools.h \
+	trilobite-redirect.h \
+	trilobite-root-client-private.h \
+	trilobite-root-client-public.h \
+	trilobite-root-helper.h \
+	trilobite-service-passwordquery-private.h \
+	trilobite-service-passwordquery-public.h \
+	trilobite-service-private.h \
+	trilobite-service-public.h \
+	$(NULL)
+
+$(TRILOBITE_HDRS):
+	rm -f $@; ln $(top_srcdir)/components/services/trilobite/libtrilobite/`basename $@` $@
+
+$(libeazelinstall_minimal_a_SOURCES) eazel-package-system-rpm4.c eazel-package-system-rpm3.c: $(TRILOBITE_HDRS)
+	rm -f $@; ln $(top_srcdir)/components/services/install/lib/`basename $@` $@
 
 eazel-package-system-rpm4.o: eazel-package-system-rpm4.c
 eazel-package-system-rpm3.o: eazel-package-system-rpm3.c
diff --git a/nautilus-installer/libtrilobite/Makefile.am b/nautilus-installer/libtrilobite/Makefile.am
index 33f84ed22..5469af4c1 100644
--- a/nautilus-installer/libtrilobite/Makefile.am
+++ b/nautilus-installer/libtrilobite/Makefile.am
@@ -15,37 +15,39 @@ libtrilobite_minimal_a_SOURCES =	\
 	trilobite-md5-tools.c		\
 	$(NULL)
 
-HDRS = \
+INCLUDES=							\
+	-DTRILOBITE_VERSION=\"0.1.0\"				\
+	-I.							\
+	-I@top_srcdir@						\
+        -I@top_srcdir@/components/services/trilobite		\
+        -I@top_srcdir@/components/services/trilobite/libtrilobite	\
+	-DTRILOBITE_SLIM 					\
+	-DG_LOG_DOMAIN=\"Nautilus-Installer\"			\
+	@GNOME_CFLAGS@						\
+	@XML_CFLAGS@						\
+	$(NULL)
+
+TRILOBITE_HDRS =  \
 	libtrilobite.h \
 	libtrilobite-service.h \
 	trilobite-core-distribution.h \
 	trilobite-core-messaging.h \
 	trilobite-core-network.h \
 	trilobite-core-utils.h \
+	trilobite-file-utilities.h \
 	trilobite-md5-tools.h \
 	trilobite-redirect.h \
 	trilobite-root-client-private.h \
 	trilobite-root-client-public.h \
 	trilobite-root-helper.h \
-	trilobite-service.h \
 	trilobite-service-passwordquery-private.h \
 	trilobite-service-passwordquery-public.h \
 	trilobite-service-private.h \
 	trilobite-service-public.h \
 	$(NULL)
 
-INCLUDES=							\
-	-DTRILOBITE_VERSION=\"0.1.0\"				\
-	-I.							\
-	-I@top_srcdir@						\
-        -I@top_srcdir@/components/services/trilobite		\
-	-DTRILOBITE_SLIM 					\
-	-DG_LOG_DOMAIN=\"Nautilus-Installer\"			\
-	@GNOME_CFLAGS@						\
-	@XML_CFLAGS@						\
-	$(NULL)
-
-$(libtrilobite_minimal_a_SOURCES) $(HDRS):
-	for i in $(top_srcdir)/components/services/trilobite/libtrilobite/*.[ch]; \
-	do bn=`basename $$i`; rm -f $$bn; ln -s $$i $$bn; done
+$(TRILOBITE_HDRS):
+	rm -f $@; ln $(top_srcdir)/components/services/trilobite/libtrilobite/`basename $@` $@
 
+$(libtrilobite_minimal_a_SOURCES): $(TRILOBITE_HDRS)
+	rm -f $@; ln $(top_srcdir)/components/services/trilobite/libtrilobite/`basename $@` $@
-- 
cgit v1.2.1