diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | nautilus-installer/.cvsignore | 3 | ||||
| -rw-r--r-- | nautilus-installer/src/.cvsignore | 4 | ||||
| -rw-r--r-- | nautilus-installer/src/Makefile | 12 | ||||
| -rwxr-xr-x | nautilus-installer/src/link.sh | 2 |
5 files changed, 21 insertions, 8 deletions
@@ -1,5 +1,13 @@ 2000-06-10 J Shane Culpepper <pepper@eazel.com> + * nautilus-installer/.cvsignore: + * nautilus-installer/src/.cvsignore: + * nautilus-installer/src/link.sh: + + Minor link fix to get nautilus-installer compiling. Added .cvsignore. + +2000-06-10 J Shane Culpepper <pepper@eazel.com> + * components/services/trilobite/libtrilobite/helixcode-utils.c: * components/services/trilobite/libtrilobite/helixcode-utils.h: Removed duplicated distribution functions. diff --git a/nautilus-installer/.cvsignore b/nautilus-installer/.cvsignore index d848e06a9..282522db0 100644 --- a/nautilus-installer/.cvsignore +++ b/nautilus-installer/.cvsignore @@ -1 +1,2 @@ -nautilus-installer +Makefile +Makefile.in diff --git a/nautilus-installer/src/.cvsignore b/nautilus-installer/src/.cvsignore new file mode 100644 index 000000000..88f364281 --- /dev/null +++ b/nautilus-installer/src/.cvsignore @@ -0,0 +1,4 @@ +Makefile +Makefile.in +nautilus-installer +nautilus-installer~ diff --git a/nautilus-installer/src/Makefile b/nautilus-installer/src/Makefile index 2d43ee8cb..5c46b020a 100644 --- a/nautilus-installer/src/Makefile +++ b/nautilus-installer/src/Makefile @@ -61,7 +61,7 @@ host_alias = i686-pc-linux-gnu host_triplet = i686-pc-linux-gnu AS = @AS@ BONOBO_CFLAGS = -I/gnome/include -DNEED_GNOMESUPPORT_H -I/gnome/lib/gnome-libs/include -I/gnome/lib/glib/include -I/usr/X11R6/include -I/gnome/include/gnome-xml -BONOBO_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lbonobo -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -ldb1 -lgmodule -ldl -lgdk_pixbuf -ltiff -ljpeg -lpng -lxml -lz -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lnsl -lm +BONOBO_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lbonobo -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -ldb1 -lgdk_pixbuf -ltiff -ljpeg -lpng -lgtk -lgdk -lgmodule -ldl -lXext -lX11 -lxml -lz -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lnsl -lm CATALOGS = CATOBJEXT = .gmo CC = gcc @@ -96,8 +96,8 @@ GNOME_CONFIG = /gnome/bin/gnome-config GNOME_LIBS = -L/gnome/lib -L/usr/lib -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl GNORBA_CFLAGS = GNORBA_LIBS = -GTKHTML_CFLAGS = -I/gnome/include -I/gnome/lib/glib/include -DNEED_GNOMESUPPORT_H -I/gnome/lib/gnome-libs/include -I/usr/X11R6/include -I/gnome/include/gnome-xml -GTKHTML_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lgtkhtml -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lgmodule -lglib -ldl -lgdk_pixbuf -ltiff -ljpeg -lpng -lxml -lz +GTKHTML_CFLAGS = -I/gnome/include -I/gnome/lib/glib/include -I/usr/X11R6/include -DNEED_GNOMESUPPORT_H -I/gnome/lib/gnome-libs/include -I/gnome/include/gnome-xml +GTKHTML_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lgtkhtml -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -ldb1 -lgdk_pixbuf -ltiff -ljpeg -lpng -lgtk -lgdk -lgmodule -lglib -ldl -lXext -lX11 -lm -lxml -lz GTK_CFLAGS = GTK_LIBS = GT_NO = @@ -117,9 +117,9 @@ LN_S = ln -s MAINT = MAKEINFO = makeinfo MKINSTALLDIRS = ./mkinstalldirs -MOZILLA_COMPONENT_CFLAGS = -I/gnome-source/MOZILLA/mozilla/dist/include -MOZILLA_COMPONENT_LDFLAGS = -L/gnome-source/MOZILLA/mozilla/dist/bin -MOZILLA_COMPONENT_LIBS = -lgtkembedmoz -lgtksuperwin -lxpcom -lnspr4 -lplc4 -lplds4 +MOZILLA_COMPONENT_CFLAGS = +MOZILLA_COMPONENT_LDFLAGS = +MOZILLA_COMPONENT_LIBS = NM = /usr/bin/nm -B OAF_CFLAGS = -I/gnome/include -I/gnome/lib/glib/include OAF_CONFIG = /gnome/bin/oaf-config diff --git a/nautilus-installer/src/link.sh b/nautilus-installer/src/link.sh index 79f72ced4..0f19def77 100755 --- a/nautilus-installer/src/link.sh +++ b/nautilus-installer/src/link.sh @@ -1,7 +1,7 @@ #! /bin/bash make clean make CFLAGS="-O -Werror" LDFLAGS="-static" -gcc -static -O -Werror -o nautilus-installer main.o support.o interface.o callbacks.o installer.o ../../components/services/trilobite/libtrilobite/helixcode-utils.o ../../components/services/install/lib/libinstall.a -L/gnome/lib -lgnomeui -lgnome -lart_lgpl -lgdk_imlib -lgtk -lgdk -lgmodule -lglib -L/usr/X11R6/lib -ldl -lXext -lX11 -lm -lSM -lICE /usr/lib/libesd.a /usr/lib/libaudiofile.a -lghttp -L/usr/lib -lrpm -lz -ldb1 -lpopt -lxml +gcc -static -O -Werror -o nautilus-installer main.o support.o interface.o callbacks.o installer.o ../../components/services/trilobite/libtrilobite/helixcode-utils.o ../../components/services/trilobite/libtrilobite/trilobite-core-distribution.o ../../components/services/install/lib/libinstall.a -L/gnome/lib -lgnomeui -lgnome -lart_lgpl -lgdk_imlib -lgtk -lgdk -lgmodule -lglib -L/usr/X11R6/lib -ldl -lXext -lX11 -lm -lSM -lICE /usr/lib/libesd.a /usr/lib/libaudiofile.a -lghttp -L/usr/lib -lrpm -lz -ldb1 -lpopt -lxml echo Stripping... strip nautilus-installer |