diff options
29 files changed, 79 insertions, 18 deletions
@@ -1,3 +1,30 @@ +2000-07-13 Elliot Lee <sopwith@redhat.com> + * TODO: Fix typo + * components/rpmview/Makefile.am, + components/services/install/command-line/Makefile.am, + components/services/install/lib/Makefile.am, + components/services/install/nautilus-view/Makefile.am, + components/services/install/server/Makefile.am, + components/services/startup/lib/Makefile.am, + components/services/time/command-line/Makefile.am, + components/services/time/service/Makefile.am, + components/services/trilobite/helper/Makefile.am, + components/services/trilobite/sample/command-line/Makefile.am, + components/services/trilobite/sample/service/Makefile.am, + components/services/vault/command-line/Makefile.am, + cut-n-paste-code/widgets/e-paned/Makefile.am, + cut-n-paste-code/widgets/nautilus-druid/Makefile.am, + libnautilus-extensions/Makefile.am, + src/Makefile.am, + test/Makefile.am: Fix srcdir != builddir: + + * components/services/trilobite/helper/eazel-helper.c, + components/services/vault/command-line/vault-operations.c, + libnautilus-extensions/nautilus-graphic.c, + libnautilus-extensions/nautilus-icon-container.c, + libnautilus-extensions/nautilus-list.c: Include string.h + for strlen prototype. + 2000-07-13 Andy Hertzfeld <andy@eazel.com> * libnautilus-extensions/nautilus-icon-factory.c: @@ -20,4 +20,4 @@ standard convention. Documentation --- -. Documentation on how to write a Natilus view. +. Documentation on how to write a Nautilus view. diff --git a/components/rpmview/Makefile.am b/components/rpmview/Makefile.am index 645604e55..f27f1f323 100644 --- a/components/rpmview/Makefile.am +++ b/components/rpmview/Makefile.am @@ -8,6 +8,8 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/components/services/install/lib \ -I$(top_srcdir)/components/services/trilobite \ + -I$(top_builddir)/components/services/install/lib \ + -I$(top_builddir)/components/services/trilobite \ -I$(top_builddir) \ -I/usr/include/rpm \ $(GCONF_CFLAGS) \ diff --git a/components/services/install-view/Makefile.am b/components/services/install-view/Makefile.am index df30d52b6..9b533af3f 100644 --- a/components/services/install-view/Makefile.am +++ b/components/services/install-view/Makefile.am @@ -8,6 +8,8 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/components/services/install/lib \ -I$(top_srcdir)/components/services/trilobite \ + -I$(top_builddir)/components/services/install/lib \ + -I$(top_builddir)/components/services/trilobite \ -I$(top_builddir) \ -I/usr/include/rpm \ $(GCONF_CFLAGS) \ diff --git a/components/services/install/command-line/Makefile.am b/components/services/install/command-line/Makefile.am index 6b25e70ac..21c710012 100644 --- a/components/services/install/command-line/Makefile.am +++ b/components/services/install/command-line/Makefile.am @@ -10,6 +10,8 @@ INCLUDES = \ -I/usr/include/rpm \ -I$(top_srcdir)/components/services/trilobite \ -I$(top_srcdir)/components/services/install/lib \ + -I$(top_builddir)/components/services/trilobite \ + -I$(top_builddir)/components/services/install/lib \ $(GNOME_CFLAGS) \ $(GCONF_CFLAGS) \ $(XML_CFLAGS) \ diff --git a/components/services/install/lib/Makefile.am b/components/services/install/lib/Makefile.am index 5d9c04a46..946b123c7 100644 --- a/components/services/install/lib/Makefile.am +++ b/components/services/install/lib/Makefile.am @@ -11,7 +11,10 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I/usr/include/rpm \ - -I$(top_srcdir)/components/services/trilobite \ + -I$(top_srcdir)/components/services/trilobite \ + -I$(top_builddir)/components/services/trilobite \ + -I$(top_srcdir)/components/services/trilobite/lib \ + -I$(top_builddir)/components/services/trilobite/lib \ $(GNOME_CFLAGS) \ $(GCONF_CFLAGS) \ $(XML_CFLAGS) \ @@ -56,6 +59,9 @@ libeazelinstall_la_SOURCES = \ eazel-install-object.c \ $(NULL) +libeazelinstall_la_LDFLAGS = \ + $(GHTTP_LIBS) + EXTRA_DIST = eazel-install-query-lex.l eazel-install-query-lex.c: $(srcdir)/eazel-install-query-lex.l eazel-install-query-parse.h diff --git a/components/services/install/nautilus-view/Makefile.am b/components/services/install/nautilus-view/Makefile.am index df30d52b6..9b533af3f 100644 --- a/components/services/install/nautilus-view/Makefile.am +++ b/components/services/install/nautilus-view/Makefile.am @@ -8,6 +8,8 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/components/services/install/lib \ -I$(top_srcdir)/components/services/trilobite \ + -I$(top_builddir)/components/services/install/lib \ + -I$(top_builddir)/components/services/trilobite \ -I$(top_builddir) \ -I/usr/include/rpm \ $(GCONF_CFLAGS) \ diff --git a/components/services/install/server/Makefile.am b/components/services/install/server/Makefile.am index 6f7c22d04..76311e08a 100644 --- a/components/services/install/server/Makefile.am +++ b/components/services/install/server/Makefile.am @@ -11,6 +11,8 @@ INCLUDES = \ -I$(top_builddir) \ -I$(top_srcdir)/components/services/install/lib \ -I$(top_srcdir)/components/services/trilobite \ + -I$(top_builddir)/components/services/install/lib \ + -I$(top_builddir)/components/services/trilobite \ -I/usr/include/rpm \ $(GHTTP_CFLAGS) \ $(GCONF_CFLAGS) \ diff --git a/components/services/startup/lib/Makefile.am b/components/services/startup/lib/Makefile.am index a7b914edd..171982645 100644 --- a/components/services/startup/lib/Makefile.am +++ b/components/services/startup/lib/Makefile.am @@ -1,5 +1,3 @@ -NULL = - CPPFLAGS = \ -DPREFIX=\"$(prefix)\" \ -DG_LOG_DOMAIN=\"trilobite-eazel-startup\" @@ -15,6 +13,4 @@ INCLUDES = \ noinst_LIBRARIES = libstartup.a -libstartup_a_SOURCES = \ - $(NULL) - +libstartup_a_SOURCES = dummy.c diff --git a/components/services/time/command-line/Makefile.am b/components/services/time/command-line/Makefile.am index d793e1d76..a1224f1b3 100644 --- a/components/services/time/command-line/Makefile.am +++ b/components/services/time/command-line/Makefile.am @@ -8,6 +8,7 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/components/services/trilobite \ + -I$(top_builddir)/components/services/trilobite \ $(GNOMEUI_CFLAGS) \ $(GCONF_CFLAGS) \ $(NULL) diff --git a/components/services/time/service/Makefile.am b/components/services/time/service/Makefile.am index 3e0930262..545ff87b0 100644 --- a/components/services/time/service/Makefile.am +++ b/components/services/time/service/Makefile.am @@ -10,6 +10,7 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/components/services/trilobite \ + -I$(top_builddir)/components/services/trilobite \ -I../server/ \ $(GHTTP_CFLAGS) \ $(GCONF_CFLAGS) \ diff --git a/components/services/trilobite/helper/Makefile.am b/components/services/trilobite/helper/Makefile.am index 1e1c6f77f..2fcd4f01b 100644 --- a/components/services/trilobite/helper/Makefile.am +++ b/components/services/trilobite/helper/Makefile.am @@ -12,9 +12,9 @@ eazel-helper.security: $(srcdir)/eazel-helper.security.in Makefile install-data-local: $(PAM_FILES) mkdir -p $(sysconfdir)/security/console.apps - cp eazel-helper.security $(sysconfdir)/security/console.apps/eazel-helper + cp $(srcdir)/eazel-helper.security $(sysconfdir)/security/console.apps/eazel-helper mkdir -p $(sysconfdir)/pam.d - cp eazel-helper.pam $(sysconfdir)/pam.d/eazel-helper + cp $(srcdir)/eazel-helper.pam $(sysconfdir)/pam.d/eazel-helper eazel_helper_SOURCES = \ eazel-helper.c \ diff --git a/components/services/trilobite/helper/eazel-helper.c b/components/services/trilobite/helper/eazel-helper.c index 2d34d9599..f95bb3aaa 100644 --- a/components/services/trilobite/helper/eazel-helper.c +++ b/components/services/trilobite/helper/eazel-helper.c @@ -34,6 +34,7 @@ #include <time.h> #include <errno.h> #include <glib.h> +#include <string.h> #define RPM_EXEC "/bin/rpm" diff --git a/components/services/trilobite/sample/command-line/Makefile.am b/components/services/trilobite/sample/command-line/Makefile.am index 707288705..f31a7a004 100644 --- a/components/services/trilobite/sample/command-line/Makefile.am +++ b/components/services/trilobite/sample/command-line/Makefile.am @@ -8,7 +8,9 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/components/services/trilobite \ + -I$(top_builddir)/components/services/trilobite \ -I$(top_srcdir)/components/services/trilobite/sample/lib \ + -I$(top_builddir)/components/services/trilobite/sample/lib \ $(GNOMEUI_CFLAGS) \ $(GCONF_CFLAGS) \ $(NULL) diff --git a/components/services/trilobite/sample/service/Makefile.am b/components/services/trilobite/sample/service/Makefile.am index b404637f2..667a30c30 100644 --- a/components/services/trilobite/sample/service/Makefile.am +++ b/components/services/trilobite/sample/service/Makefile.am @@ -10,6 +10,8 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/components/services/trilobite \ + -I$(top_builddir)/components/services/trilobite \ + -I$(top_builddir)/components/services/trilobite/sample/lib \ -I$(top_srcdir)/components/services/trilobite/sample/lib \ -I../server/ \ $(GCONF_CFLAGS) \ diff --git a/components/services/vault/command-line/vault-operations.c b/components/services/vault/command-line/vault-operations.c index 1d356d996..db020a250 100644 --- a/components/services/vault/command-line/vault-operations.c +++ b/components/services/vault/command-line/vault-operations.c @@ -24,6 +24,7 @@ #include <config.h> #include <unistd.h> #include <glib.h> +#include <string.h> #include "vault-operations.h" static GnomeVFSResult vault_list(GList *args, gchar *uri, gboolean debug, gchar **error_context); diff --git a/configure.in b/configure.in index dee8c6f6d..2b74bec58 100644 --- a/configure.in +++ b/configure.in @@ -219,8 +219,7 @@ AC_MSG_ERROR([ *** GLIB 1.2.0 or better is required. The latest version of GLIB *** is always available from ftp://ftp.gtk.org/.])) -AM_PATH_GNOME(1.0.0,,AC_MSG_ERROR([*** GNOME 1.0.0 or better is -required.]), gnomecanvaspixbuf bonobo vfs idl) +AM_PATH_GNOME(1.0.0,,AC_MSG_ERROR([*** GNOME 1.0.0 or better is required.]), gnomecanvaspixbuf bonobo vfs idl) AC_SUBST(GNOMECANVASPIXBUF_LIBS) AC_SUBST(GNOMECANVASPIXBUF_INCLUDEDIR) AC_SUBST(GNORBA_CFLAGS) diff --git a/cut-n-paste-code/widgets/e-paned/Makefile.am b/cut-n-paste-code/widgets/e-paned/Makefile.am index ac3a13c29..1889e15a7 100644 --- a/cut-n-paste-code/widgets/e-paned/Makefile.am +++ b/cut-n-paste-code/widgets/e-paned/Makefile.am @@ -3,7 +3,7 @@ NULL= lib_LTLIBRARIES=libe-paned.la INCLUDES = \ - -I$(top_builddir)/cut-n-paste-code \ + -I$(top_srcdir)/cut-n-paste-code \ $(GNOME_CFLAGS) \ $(NULL) diff --git a/cut-n-paste-code/widgets/nautilus-druid/Makefile.am b/cut-n-paste-code/widgets/nautilus-druid/Makefile.am index e5671afdd..b698cbbe3 100644 --- a/cut-n-paste-code/widgets/nautilus-druid/Makefile.am +++ b/cut-n-paste-code/widgets/nautilus-druid/Makefile.am @@ -3,7 +3,7 @@ NULL= lib_LTLIBRARIES=libnautilus-druid.la INCLUDES = \ - -I$(top_builddir)/cut-n-paste-code \ + -I$(top_srcdir)/cut-n-paste-code \ $(GNOME_CFLAGS) \ $(GDK_PIXBUF_CFLAGS) \ $(NULL) diff --git a/libnautilus-extensions/Makefile.am b/libnautilus-extensions/Makefile.am index 66ee8a968..38aa697bb 100644 --- a/libnautilus-extensions/Makefile.am +++ b/libnautilus-extensions/Makefile.am @@ -5,7 +5,8 @@ lib_LTLIBRARIES=libnautilus-extensions.la INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ - -I$(top_builddir)/cut-n-paste-code \ + -I$(top_builddir)/libnautilus \ + -I$(top_srcdir)/cut-n-paste-code \ $(GNOME_CFLAGS) \ $(BONOBO_CFLAGS) \ $(OAF_CFLAGS) \ diff --git a/libnautilus-extensions/nautilus-graphic.c b/libnautilus-extensions/nautilus-graphic.c index 0695722c5..fc9de3e7a 100644 --- a/libnautilus-extensions/nautilus-graphic.c +++ b/libnautilus-extensions/nautilus-graphic.c @@ -30,6 +30,7 @@ #include "nautilus-gdk-pixbuf-extensions.h" #include <math.h> +#include <string.h> /* FIXME bugzilla.eazel.com 1612: * We should use NautilusBackground for the background. This will simplify diff --git a/libnautilus-extensions/nautilus-icon-container.c b/libnautilus-extensions/nautilus-icon-container.c index 85abfe6e9..6774ce749 100644 --- a/libnautilus-extensions/nautilus-icon-container.c +++ b/libnautilus-extensions/nautilus-icon-container.c @@ -29,6 +29,7 @@ #include <ctype.h> #include <math.h> #include <stdio.h> +#include <string.h> #include <gdk/gdkkeysyms.h> #include <gtk/gtksignal.h> diff --git a/libnautilus-extensions/nautilus-list.c b/libnautilus-extensions/nautilus-list.c index f9fa1121a..902ae00b6 100644 --- a/libnautilus-extensions/nautilus-list.c +++ b/libnautilus-extensions/nautilus-list.c @@ -30,6 +30,8 @@ #include "nautilus-list.h" #include <ctype.h> +#include <string.h> + #include <gdk/gdkkeysyms.h> #include <gtk/gtkbindings.h> #include <gtk/gtkdnd.h> diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am index 66ee8a968..38aa697bb 100644 --- a/libnautilus-private/Makefile.am +++ b/libnautilus-private/Makefile.am @@ -5,7 +5,8 @@ lib_LTLIBRARIES=libnautilus-extensions.la INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ - -I$(top_builddir)/cut-n-paste-code \ + -I$(top_builddir)/libnautilus \ + -I$(top_srcdir)/cut-n-paste-code \ $(GNOME_CFLAGS) \ $(BONOBO_CFLAGS) \ $(OAF_CFLAGS) \ diff --git a/libnautilus-private/nautilus-graphic.c b/libnautilus-private/nautilus-graphic.c index 0695722c5..fc9de3e7a 100644 --- a/libnautilus-private/nautilus-graphic.c +++ b/libnautilus-private/nautilus-graphic.c @@ -30,6 +30,7 @@ #include "nautilus-gdk-pixbuf-extensions.h" #include <math.h> +#include <string.h> /* FIXME bugzilla.eazel.com 1612: * We should use NautilusBackground for the background. This will simplify diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index 85abfe6e9..6774ce749 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -29,6 +29,7 @@ #include <ctype.h> #include <math.h> #include <stdio.h> +#include <string.h> #include <gdk/gdkkeysyms.h> #include <gtk/gtksignal.h> diff --git a/libnautilus-private/nautilus-list.c b/libnautilus-private/nautilus-list.c index f9fa1121a..902ae00b6 100644 --- a/libnautilus-private/nautilus-list.c +++ b/libnautilus-private/nautilus-list.c @@ -30,6 +30,8 @@ #include "nautilus-list.h" #include <ctype.h> +#include <string.h> + #include <gdk/gdkkeysyms.h> #include <gtk/gtkbindings.h> #include <gtk/gtkdnd.h> diff --git a/src/Makefile.am b/src/Makefile.am index 367b48d33..537f1fd46 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,6 +7,7 @@ bin_PROGRAMS=nautilus INCLUDES =\ -I$(top_srcdir) \ -I$(top_builddir) \ + -I$(top_srcdir)/cut-n-paste-code \ -I$(top_builddir)/cut-n-paste-code \ $(BONOBO_CFLAGS) \ $(OAF_CFLAGS) \ @@ -120,7 +121,7 @@ nautilus_SOURCES = \ $(nautilus_shell_interface_idl_sources): nautilus_shell_interface_idl_stamp nautilus_shell_interface_idl_stamp: nautilus-shell-interface.idl $(top_srcdir)/libnautilus/nautilus-view-component.idl - $(ORBIT_IDL) $(IDL_CFLAGS) -I.. nautilus-shell-interface.idl + $(ORBIT_IDL) $(IDL_CFLAGS) -I$(top_srcdir) $(srcdir)/nautilus-shell-interface.idl touch nautilus_shell_interface_idl_stamp TESTS=check-nautilus diff --git a/test/Makefile.am b/test/Makefile.am index 132117e2e..9eb2c80e6 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -84,7 +84,9 @@ all: libleakcheck.so CLEANFILES += libleakcheck.so libleakcheck.so: nautilus-leak-checker.c nautilus-leak-hash-table.c nautilus-leak-symbol-lookup.c - gcc nautilus-leak-checker.c nautilus-leak-hash-table.c nautilus-leak-symbol-lookup.c -Wall -o $@ -shared $(GLIB_CFLAGS) $(GLIB_LIBS) -lpthread -ldl -Wl,-Bstatic -lbfd -liberty -Wl,-Bdynamic + gcc $(srcdir)/nautilus-leak-checker.c $(srcdir)/nautilus-leak-hash-table.c \ + $(srcdir)/nautilus-leak-symbol-lookup.c \ + -Wall -o $@ -shared $(GLIB_CFLAGS) $(GLIB_LIBS) -lpthread -ldl -Wl,-Bstatic -lbfd -liberty -Wl,-Bdynamic # to include them in "make dist" EXTRA_DIST = nautilus-leak-checker.c nautilus-leak-hash-table.c nautilus-leak-symbol-lookup.c \ @@ -94,4 +96,6 @@ leakcheck_DATA = libleakcheck.so leakcheckdir= $(DESTDIR)$(libdir) leakchecktest: nautilus-leak-checker.c nautilus-leak-hash-table.c nautilus-leak-symbol-lookup.c - gcc nautilus-leak-checker.c nautilus-leak-hash-table.c nautilus-leak-symbol-lookup.c -Wall -o $@ -DLEAK_CHECK_TESTING $(GLIB_CFLAGS) $(GLIB_LIBS) -lpthread -ldl -Wl,-Bstatic -lbfd -liberty -Wl,-Bdynamic + gcc $(srcdir)/nautilus-leak-checker.c $(srcdir)/nautilus-leak-hash-table.c \ + $(srcdir)/nautilus-leak-symbol-lookup.c \ + -Wall -o $@ -DLEAK_CHECK_TESTING $(GLIB_CFLAGS) $(GLIB_LIBS) -lpthread -ldl -Wl,-Bstatic -lbfd -liberty -Wl,-Bdynamic |