diff options
| author | Ramiro Estrugo <ramiro@src.gnome.org> | 2000-03-12 13:00:34 +0000 |
|---|---|---|
| committer | Ramiro Estrugo <ramiro@src.gnome.org> | 2000-03-12 13:00:34 +0000 |
| commit | 3539ca758811297bf7f3c4399e59189829be9c17 (patch) | |
| tree | a9059a3e685db39c33e5b8de72d61b8a38aabeeb | |
| parent | 63c6d54af8f166fa74f16d8efcaad6b443930c9d (diff) | |
| download | nautilus-3539ca758811297bf7f3c4399e59189829be9c17.tar.gz | |
Link all components with nautilus-widgets.
| -rw-r--r-- | ChangeLog-20000414 | 11 | ||||
| -rw-r--r-- | components/help/Makefile.am | 7 | ||||
| -rw-r--r-- | components/history/Makefile.am | 7 | ||||
| -rw-r--r-- | components/html/Makefile.am | 1 | ||||
| -rw-r--r-- | components/music/Makefile.am | 1 | ||||
| -rw-r--r-- | components/notes/Makefile.am | 7 | ||||
| -rw-r--r-- | components/sample/Makefile.am | 1 | ||||
| -rw-r--r-- | components/websearch/Makefile.am | 7 |
8 files changed, 38 insertions, 4 deletions
diff --git a/ChangeLog-20000414 b/ChangeLog-20000414 index d3c58fdcc..4915a47e8 100644 --- a/ChangeLog-20000414 +++ b/ChangeLog-20000414 @@ -1,5 +1,16 @@ 2000-03-12 Ramiro Estrugo <ramiro@eazel.com> + * components/help/Makefile.am: + * components/history/Makefile.am: + * components/html/Makefile.am: + * components/music/Makefile.am: + * components/notes/Makefile.am: + * components/sample/Makefile.am: + * components/websearch/Makefile.am: + Link all components with nautilus-widgets. + +2000-03-12 Ramiro Estrugo <ramiro@eazel.com> + * libnautilus/Makefile.am, libnautilus/nautilus-global-preferences.c: New file libnautilus/nautilus-global-preferences.h: New file diff --git a/components/help/Makefile.am b/components/help/Makefile.am index 03e80cf90..ed756cc46 100644 --- a/components/help/Makefile.am +++ b/components/help/Makefile.am @@ -5,7 +5,12 @@ bin_PROGRAMS=hyperbola INCLUDES=-I$(top_srcdir) -I$(top_builddir) \ $(GNOMEUI_CFLAGS) $(BONOBO_CFLAGS) \ -DINFODIR=\"$(infodir)\" -LDADD=$(top_builddir)/libnautilus/libnautilus.la $(BONOBO_LIBS) $(GNOMEUI_LIBS) + +LDADD =\ + $(top_builddir)/nautilus-widgets/libnautilus-widgets.la \ + $(top_builddir)/libnautilus/libnautilus.la \ + $(BONOBO_LIBS) \ + $(GNOMEUI_LIBS) hyperbola_SOURCES= \ hyperbola-nav-tree.c \ diff --git a/components/history/Makefile.am b/components/history/Makefile.am index 8be74ae2a..3c6589138 100644 --- a/components/history/Makefile.am +++ b/components/history/Makefile.am @@ -1,7 +1,12 @@ bin_PROGRAMS=ntl-history-view INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GNOMEUI_CFLAGS) $(BONOBO_CFLAGS) $(WERROR) -LDADD=$(top_builddir)/libnautilus/libnautilus.la $(BONOBO_LIBS) $(GNOMEUI_LIBS) + +LDADD=\ + $(top_builddir)/nautilus-widgets/libnautilus-widgets.la \ + $(top_builddir)/libnautilus/libnautilus.la \ + $(BONOBO_LIBS) \ + $(GNOMEUI_LIBS) ntl_history_view_SOURCES=ntl-history-view.c diff --git a/components/html/Makefile.am b/components/html/Makefile.am index e45f6b636..9aad4571c 100644 --- a/components/html/Makefile.am +++ b/components/html/Makefile.am @@ -29,6 +29,7 @@ ntl_web_browser_SOURCES = \ gnome-dialogs.c ntl_web_browser_LDFLAGS = \ + $(top_builddir)/nautilus-widgets/libnautilus-widgets.la \ $(top_builddir)/libnautilus/libnautilus.la \ $(GTKHTML_LIBS) \ $(BONOBO_LIBS) \ diff --git a/components/music/Makefile.am b/components/music/Makefile.am index f0ee5b3ab..9ecbfb291 100644 --- a/components/music/Makefile.am +++ b/components/music/Makefile.am @@ -24,6 +24,7 @@ nautilus_music_view_SOURCES = \ main.c nautilus_music_view_LDFLAGS = \ + $(top_builddir)/nautilus-widgets/libnautilus-widgets.la \ $(top_builddir)/libnautilus/libnautilus.la \ $(BONOBO_LIBS) \ $(GNOMEUI_LIBS) \ diff --git a/components/notes/Makefile.am b/components/notes/Makefile.am index b9975f95b..90ce0f243 100644 --- a/components/notes/Makefile.am +++ b/components/notes/Makefile.am @@ -1,7 +1,12 @@ bin_PROGRAMS=ntl-notes INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GNOMEUI_CFLAGS) $(BONOBO_CFLAGS) $(WERROR) -LDADD=$(top_builddir)/libnautilus/libnautilus.la $(BONOBO_LIBS) $(GNOMEUI_LIBS) + +LDADD=\ + $(top_builddir)/nautilus-widgets/libnautilus-widgets.la \ + $(top_builddir)/libnautilus/libnautilus.la \ + $(BONOBO_LIBS) \ + $(GNOMEUI_LIBS) ntl_notes_SOURCES=ntl-notes.c diff --git a/components/sample/Makefile.am b/components/sample/Makefile.am index 6ac029741..8059a4782 100644 --- a/components/sample/Makefile.am +++ b/components/sample/Makefile.am @@ -23,6 +23,7 @@ nautilus_sample_content_view_SOURCES = \ main.c nautilus_sample_content_view_LDFLAGS = \ + $(top_builddir)/nautilus-widgets/libnautilus-widgets.la \ $(top_builddir)/libnautilus/libnautilus.la \ $(BONOBO_LIBS) \ $(GNOMEUI_LIBS) \ diff --git a/components/websearch/Makefile.am b/components/websearch/Makefile.am index c15d35b80..56d6046d1 100644 --- a/components/websearch/Makefile.am +++ b/components/websearch/Makefile.am @@ -1,7 +1,12 @@ bin_PROGRAMS=ntl-web-search INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GNOMEUI_CFLAGS) $(BONOBO_CFLAGS) $(WERROR) -LDADD=$(top_builddir)/libnautilus/libnautilus.la $(BONOBO_LIBS) $(GNOMEUI_LIBS) + +LDADD=\ + $(top_builddir)/nautilus-widgets/libnautilus-widgets.la \ + $(top_builddir)/libnautilus/libnautilus.la \ + $(BONOBO_LIBS) \ + $(GNOMEUI_LIBS) ntl_web_search_SOURCES=ntl-web-search.c |