gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-08-25 02:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the cut-n-paste libraries be only static archives. Link all the

Browse source 
* Makefile.am:
	* components/hardware/Makefile.am:
	* components/help/Makefile.am:
	* components/history/Makefile.am:
	* components/html/Makefile.am:
	* components/loser/content/Makefile.am:
	* components/loser/sidebar/Makefile.am:
	* components/music/Makefile.am:
	* components/notes/Makefile.am:
	* components/rpmview/Makefile.am:
	* components/services/install/nautilus-view/Makefile.am:
	* components/services/inventory/nautilus-view/Makefile.am:
	* components/services/login/nautilus-view/Makefile.am:
	* components/services/startup/nautilus-view/Makefile.am:
	* components/services/summary/nautilus-view/Makefile.am:
	* components/services/time/nautilus-view/Makefile.am:
	* components/services/trilobite/sample/nautilus-view/Makefile.am:
	* components/services/vault/nautilus-view/Makefile.am:
	* components/tree/Makefile.am:
	* components/websearch/Makefile.am:
	* cut-n-paste-code/widgets/e-paned/Makefile.am:
	* cut-n-paste-code/widgets/nautilus-druid/Makefile.am:
	* helper-utilities/authenticate/Makefile.am:
	* libnautilus-extensions/Makefile.am:
	* librsvg/Makefile.am:
	* src/Makefile.am:
	* test/Makefile.am:

	Make the cut-n-paste libraries be only static archives.  Link all
	the private libraries statically into libnautilus-extensions.
	Remove all the references to private libraries in all the
	components and other users of libnautilus-extensions so that
	dependencies can be managed in just one place.
This commit is contained in:
Ramiro Estrugo 2000-07-26 21:53:48 +00:00
parent 61367f1266
commit 4232317b33
30 changed files with 73 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
ChangeLog
View file

@ -1,3 +1,39 @@
2000-07-26 Ramiro Estrugo <ramiro@eazel.com>
* Makefile.am:
* components/hardware/Makefile.am:
* components/help/Makefile.am:
* components/history/Makefile.am:
* components/html/Makefile.am:
* components/loser/content/Makefile.am:
* components/loser/sidebar/Makefile.am:
* components/music/Makefile.am:
* components/notes/Makefile.am:
* components/rpmview/Makefile.am:
* components/services/install/nautilus-view/Makefile.am:
* components/services/inventory/nautilus-view/Makefile.am:
* components/services/login/nautilus-view/Makefile.am:
* components/services/startup/nautilus-view/Makefile.am:
* components/services/summary/nautilus-view/Makefile.am:
* components/services/time/nautilus-view/Makefile.am:
* components/services/trilobite/sample/nautilus-view/Makefile.am:
* components/services/vault/nautilus-view/Makefile.am:
* components/tree/Makefile.am:
* components/websearch/Makefile.am:
* cut-n-paste-code/widgets/e-paned/Makefile.am:
* cut-n-paste-code/widgets/nautilus-druid/Makefile.am:
* helper-utilities/authenticate/Makefile.am:
* libnautilus-extensions/Makefile.am:
* librsvg/Makefile.am:
* src/Makefile.am:
* test/Makefile.am:
Make the cut-n-paste libraries be only static archives. Link all
the private libraries statically into libnautilus-extensions.
Remove all the references to private libraries in all the
components and other users of libnautilus-extensions so that
dependencies can be managed in just one place.
2000-07-26 Robey Pointer <robey@eazel.com>
*

2
Makefile.am
View file

@ -6,9 +6,9 @@ SUBDIRS =\
idl \
intl \
cut-n-paste-code \
librsvg \
libnautilus \
libnautilus-extensions \
librsvg \
helper-utilities \
components \
po \

2
components/hardware/Makefile.am
View file

@ -30,8 +30,6 @@ nautilus_hardware_view_SOURCES = \
nautilus_hardware_view_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(GCONF_LIBS) \

2
components/help/Makefile.am
View file

@ -20,8 +20,6 @@ INCLUDES = \
LDADD =\
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GCONF_LIBS) \
$(GNOMEUI_LIBS) \

2
components/history/Makefile.am
View file

@ -6,8 +6,6 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GNOMEUI_CFLAGS) $(GCONF_CFLAGS) \
LDADD=\
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GCONF_LIBS) \
$(GNOMEUI_LIBS)

2
components/html/Makefile.am
View file

@ -36,8 +36,6 @@ ntl_web_browser_SOURCES = \
ntl_web_browser_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(GTKHTML_LIBS) \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \

2
components/loser/content/Makefile.am
View file

@ -30,8 +30,6 @@ nautilus_content_loser_SOURCES = \
nautilus_content_loser_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(GNOMEUI_LIBS) \
$(BONOBO_LIBS) \
$(GCONF_LIBS) \

2
components/loser/sidebar/Makefile.am
View file

@ -27,8 +27,6 @@ nautilus_sidebar_loser_SOURCES = \
nautilus_sidebar_loser_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(GNOMEUI_LIBS) \
$(BONOBO_LIBS) \
$(GCONF_LIBS) \

2
components/music/Makefile.am
View file

@ -34,8 +34,6 @@ nautilus_music_view_SOURCES = \
nautilus_music_view_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(GCONF_LIBS) \

2
components/notes/Makefile.am
View file

@ -13,8 +13,6 @@ INCLUDES=\
LDADD=\
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GCONF_LIBS) \
$(GNOMEUI_LIBS)

2
components/rpmview/Makefile.am
View file

@ -42,8 +42,6 @@ nautilus_rpm_view_SOURCES = \
nautilus_rpm_view_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(extra_libs) \
$(BONOBO_LIBS) \
$(GCONF_LIBS) \

2
components/services/install-view/Makefile.am
View file

@ -37,8 +37,6 @@ nautilus_service_install_view_SOURCES = \
nautilus_service_install_view_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(top_builddir)/components/services/install/lib/libeazelinstall.la \
$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
$(top_builddir)/components/services/nautilus-dependant-shared/libnautilusdepshared.a \

2
components/services/install/nautilus-view/Makefile.am
View file

@ -37,8 +37,6 @@ nautilus_service_install_view_SOURCES = \
nautilus_service_install_view_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(top_builddir)/components/services/install/lib/libeazelinstall.la \
$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
$(top_builddir)/components/services/nautilus-dependant-shared/libnautilusdepshared.a \

2
components/services/inventory/nautilus-view/Makefile.am
View file

@ -38,8 +38,6 @@ nautilus_inventory_view_LDADD = \
$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(GCONF_LIBS) \

2
components/services/login/nautilus-view/Makefile.am
View file

@ -40,8 +40,6 @@ nautilus_login_view_LDADD = \
$(top_builddir)/components/services/nautilus-dependant-shared/libnautilusdepshared.a \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(GCONF_LIBS) \

2
components/services/startup/nautilus-view/Makefile.am
View file

@ -38,8 +38,6 @@ nautilus_service_startup_view_LDADD = \
$(top_builddir)/components/services/nautilus-dependant-shared/libnautilusdepshared.a \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(GCONF_LIBS) \

2
components/services/summary/nautilus-view/Makefile.am
View file

@ -40,8 +40,6 @@ nautilus_summary_view_LDADD = \
$(top_builddir)/components/services/nautilus-dependant-shared/libnautilusdepshared.a \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(GCONF_LIBS) \

2
components/services/time/nautilus-view/Makefile.am
View file

@ -69,8 +69,6 @@ trilobite_eazel_time_view_LDADD = \
$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(GNOMEUI_LIBS) \
$(BONOBO_LIBS) \
$(GCONF_LIBS) \

2
components/services/trilobite/sample/nautilus-view/Makefile.am
View file

@ -36,8 +36,6 @@ nautilus_sample_service_view_LDADD = \
$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(GCONF_LIBS) \

2
components/services/vault/nautilus-view/Makefile.am
View file

@ -36,8 +36,6 @@ nautilus_vault_view_LDADD = \
$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(GCONF_LIBS) \

2
components/tree/Makefile.am
View file

@ -35,8 +35,6 @@ nautilus_tree_view_SOURCES = \
nautilus_tree_view_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(GNOMEUI_LIBS) \
$(BONOBO_LIBS) \
$(GCONF_LIBS) \

2
components/websearch/Makefile.am
View file

@ -11,9 +11,7 @@ INCLUDES=\
LDADD=\
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GCONF_LIBS) \
$(GNOMEUI_LIBS)

10
cut-n-paste-code/widgets/e-paned/Makefile.am
View file

@ -1,17 +1,13 @@
NULL=
lib_LTLIBRARIES=libe-paned.la
noinst_LTLIBRARIES = libe-paned.la
INCLUDES = \
-I$(top_srcdir)/cut-n-paste-code \
$(GNOME_CFLAGS) \
$(NULL)
libe_paned_la_LDFLAGS=\
$(GNOME_LIBS) \
$(NULL)
libe_panedincludedir=$(includedir)/libe-paned
libe_paned_la_LDFLAGS = -static
libe_paned_la_SOURCES = \
e-hpaned.c \
@ -19,8 +15,6 @@ libe_paned_la_SOURCES = \
e-vpaned.c \
$(NULL)
libe_panedinclude_HEADERS =
# Everything is private for now
noinst_HEADERS =\
e-hpaned.h \

7
cut-n-paste-code/widgets/nautilus-druid/Makefile.am
View file

@ -1,6 +1,6 @@
NULL=
lib_LTLIBRARIES=libnautilus-druid.la
noinst_LTLIBRARIES = libnautilus-druid.la
INCLUDES = \
-I$(top_srcdir)/cut-n-paste-code \
@ -8,10 +8,7 @@ INCLUDES = \
$(GDK_PIXBUF_CFLAGS) \
$(NULL)
libnautilus_druid_la_LDFLAGS=\
$(GNOME_LIBS) \
$(GDK_PIXBUF_LIBS) \
$(NULL)
libnautilus_druid_la_LDFLAGS = -static
libnautilus_druid_la_SOURCES = \
nautilus-druid-page-edge.c \

2
helper-utilities/authenticate/Makefile.am
View file

@ -20,8 +20,6 @@ nautilus_authenticate_SOURCES =\
nautilus_authenticate_LDADD = \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(GNOMEUI_LIBS) \
$(GCONF_LIBS) \
$(PAM_LIBS) \

5
libnautilus-extensions/Makefile.am
View file

@ -21,7 +21,12 @@ INCLUDES = \
$(NULL)
libnautilus_extensions_la_LDFLAGS= \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/cut-n-paste-code/widgets/nautilus-druid/libnautilus-druid.la \
$(top_builddir)/librsvg/librsvg.la \
$(top_builddir)/cut-n-paste-code/freetype/libfreetype2.la \
$(GNOME_LIBS) \
$(GNOMECANVASPIXBUF_LIBS) \
$(OAF_LIBS) \
$(BONOBO_LIBS) \
$(GHTTP_LIBS) \

5
libnautilus-private/Makefile.am
View file

@ -21,7 +21,12 @@ INCLUDES = \
$(NULL)
libnautilus_extensions_la_LDFLAGS= \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/cut-n-paste-code/widgets/nautilus-druid/libnautilus-druid.la \
$(top_builddir)/librsvg/librsvg.la \
$(top_builddir)/cut-n-paste-code/freetype/libfreetype2.la \
$(GNOME_LIBS) \
$(GNOMECANVASPIXBUF_LIBS) \
$(OAF_LIBS) \
$(BONOBO_LIBS) \
$(GHTTP_LIBS) \

52
librsvg/Makefile.am
View file

@ -2,19 +2,7 @@ NULL=
bin_PROGRAMS=test-rsvg test-ft
test_rsvg_LDADD =\
$(GNOMECANVASPIXBUF_LIBS) \
$(GNOMEUI_LIBS) \
$(XML_LIBS) \
librsvg.la
test_ft_LDADD =\
$(GNOMECANVASPIXBUF_LIBS) \
$(GNOMEUI_LIBS) \
$(XML_LIBS) \
librsvg.la
lib_LTLIBRARIES=librsvg.la
noinst_LTLIBRARIES = librsvg.la
INCLUDES = \
-I$(top_srcdir)/cut-n-paste-code \
@ -26,21 +14,13 @@ INCLUDES = \
-D_REENTRANT \
$(NULL)
librsvg_la_LDFLAGS=\
$(top_builddir)/cut-n-paste-code/freetype/libfreetype2.la
$(GNOME_LIBS) \
$(GNOMECANVASPIXBUF_LIBS) \
$(GDK_PIXBUF_LIBS) \
$(XML_LIBS) \
$(LIBPNG) \
librsvg_la_LDFLAGS= -static
noinst_HEADERS =\
rsvg.h \
$(NULL)
librsvgincludedir=$(includedir)/librsvg
librsvginclude_HEADERS= \
rsvg.h \
$(NULL)
librsvg_la_SOURCES= \
librsvg_la_SOURCES =\
rsvg.c \
rsvg.h \
rsvg-bpath-util.c \
@ -65,9 +45,21 @@ librsvg_la_SOURCES= \
art_render_svp.h \
$(NULL)
test_rsvg_LIBS =\
$(GDK_PIXBUF_LIBS)
test_rsvg_SOURCES = test-rsvg.c
test_ft_SOURCES = test-rsvg.c
test_rsvg_SOURCES =\
test-rsvg.c \
test_rsvg_LDADD =\
librsvg.la \
$(top_builddir)/cut-n-paste-code/freetype/libfreetype2.la \
$(GNOMECANVASPIXBUF_LIBS) \
$(GNOMEUI_LIBS) \
$(XML_LIBS) \
$(NULL)
test_ft_LDADD =\
librsvg.la \
$(top_builddir)/cut-n-paste-code/freetype/libfreetype2.la \
$(GNOMECANVASPIXBUF_LIBS) \
$(GNOMEUI_LIBS) \
$(XML_LIBS) \
$(NULL)

3
src/Makefile.am
View file

@ -25,9 +25,6 @@ LDADD =\
$(top_builddir)/src/file-manager/libnautilus-file-manager.la \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/cut-n-paste-code/widgets/nautilus-druid/libnautilus-druid.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(OAF_LIBS) \
$(GCONF_LIBS) \

2
test/Makefile.am
View file

@ -17,8 +17,6 @@ INCLUDES =\
LDADD =\
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(OAF_LIBS) \
$(GCONF_LIBS) \