diff options
| author | Eric Fischer <eric@src.gnome.org> | 2001-02-21 18:26:05 +0000 |
|---|---|---|
| committer | Eric Fischer <eric@src.gnome.org> | 2001-02-21 18:26:05 +0000 |
| commit | 86af19af06249a519a253a5016b08e0af607ff86 (patch) | |
| tree | 9888d4a4988ad67fc88a47173aef1fb0d18c81be /nautilus-installer | |
| parent | a6b2a6fd3fc1ac42bc2b0bef831d1478812b80ec (diff) | |
| download | nautilus-86af19af06249a519a253a5016b08e0af607ff86.tar.gz | |
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.
Diffstat (limited to 'nautilus-installer')
| -rw-r--r-- | nautilus-installer/install-lib/Makefile.am | 29 | ||||
| -rw-r--r-- | nautilus-installer/libtrilobite/Makefile.am | 34 |
2 files changed, 44 insertions, 19 deletions
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 $@` $@ |