diff options
| author | Ramiro Estrugo <ramiro@src.gnome.org> | 2000-07-26 21:53:48 +0000 |
|---|---|---|
| committer | Ramiro Estrugo <ramiro@src.gnome.org> | 2000-07-26 21:53:48 +0000 |
| commit | 4232317b33a1447993382da12bfdbce0bab4c058 (patch) | |
| tree | 3fe379878fa31bf2b2de310fbd64969278e356e8 /librsvg | |
| parent | 61367f126695f5245224716fe198fab4eb34fba2 (diff) | |
| download | nautilus-4232317b33a1447993382da12bfdbce0bab4c058.tar.gz | |
Make the cut-n-paste libraries be only static archives. Link all the
* 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.
Diffstat (limited to 'librsvg')
| -rw-r--r-- | librsvg/Makefile.am | 50 |
1 files changed, 21 insertions, 29 deletions
diff --git a/librsvg/Makefile.am b/librsvg/Makefile.am index bb2499504..26dc23771 100644 --- a/librsvg/Makefile.am +++ b/librsvg/Makefile.am @@ -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) \ - $(NULL) +librsvg_la_LDFLAGS= -static -librsvgincludedir=$(includedir)/librsvg -librsvginclude_HEADERS= \ - rsvg.h \ +noinst_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) |