mass change of LDFLAGS to LDADD

This commit is contained in:
Robin Slomkowski 2000-07-11 21:30:29 +00:00
parent 90166baced
commit b9c988de83
22 changed files with 46 additions and 48 deletions

View file

@ -1,3 +1,27 @@
2000-07-11 Robin * Slomkowski <rslomkow@eazel.com>
* components/html/Makefile.am:
* components/loser/content/Makefile.am:
* components/loser/sidebar/Makefile.am:
* components/mozilla/Makefile.am:
* components/music/Makefile.am:
* components/rpmview/Makefile.am:
* components/sample/Makefile.am:
* components/services/install/nautilus-view/Makefile.am:
* components/services/login/nautilus-view/Makefile.am:
* components/services/startup/command-line/Makefile.am:
* components/services/summary/nautilus-view/Makefile.am:
* components/services/time/command-line/Makefile.am:
* components/services/time/nautilus-view/Makefile.am:
* components/services/trilobite/sample/command-line/Makefile.am:
* components/services/trilobite/sample/nautilus-view/Makefile.am:
* components/services/vault/command-line/Makefile.am:
* components/services/vault/nautilus-view/Makefile.am:
* components/tree/Makefile.am:
* helper-utilities/authenticate/Makefile.am:
* test/Makefile.am:
mass change of LDFLAGS to LDADD
2000-07-11 Darin Adler <darin@eazel.com>
Fixed some leaks that cause problems with the new Bonobo.

View file

@ -32,7 +32,7 @@ ntl_web_browser_SOURCES = \
glibwww.h \
gnome-dialogs.c
ntl_web_browser_LDFLAGS = \
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 \

View file

@ -23,7 +23,7 @@ nautilus_content_loser_SOURCES = \
nautilus-content-loser.c \
main.c
nautilus_content_loser_LDFLAGS = \
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 \

View file

@ -23,7 +23,7 @@ nautilus_sidebar_loser_SOURCES = \
nautilus-sidebar-loser.c \
main.c
nautilus_sidebar_loser_LDFLAGS = \
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 \

View file

@ -28,7 +28,7 @@ noinst_HEADERS = \
mozilla-preferences.h \
$(NULL)
nautilus_mozilla_content_view_LDFLAGS = \
nautilus_mozilla_content_view_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \

View file

@ -30,7 +30,7 @@ nautilus_music_view_SOURCES = \
main.c \
pixmaps.h
nautilus_music_view_LDFLAGS = \
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 \

View file

@ -30,10 +30,7 @@ nautilus_rpm_view_SOURCES = \
nautilus-rpm-view-install.c \
main.c
nautilus_rpm_view_LDADD = \
$(RPM_LIBS)
nautilus_rpm_view_LDFLAGS = \
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 \

View file

@ -23,7 +23,7 @@ nautilus_sample_content_view_SOURCES = \
nautilus-sample-content-view.c \
main.c
nautilus_sample_content_view_LDFLAGS = \
nautilus_sample_content_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 \

View file

@ -32,11 +32,6 @@ nautilus_service_install_view_SOURCES = \
$(NULL)
nautilus_service_install_view_LDADD = \
$(RPM_LIBS) \
$(NULL)
nautilus_service_install_view_LDFLAGS = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \

View file

@ -32,11 +32,6 @@ nautilus_service_install_view_SOURCES = \
$(NULL)
nautilus_service_install_view_LDADD = \
$(RPM_LIBS) \
$(NULL)
nautilus_service_install_view_LDFLAGS = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \

View file

@ -34,7 +34,7 @@ nautilus_login_view_SOURCES = \
main.c \
$(NULL)
nautilus_login_view_LDFLAGS = \
nautilus_login_view_LDADD = \
$(top_builddir)/components/services/login/lib/liblogin_corba.a \
$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
$(top_builddir)/libnautilus/libnautilus.la \

View file

@ -21,7 +21,7 @@ eazel_register_SOURCES = \
eazel-register.c \
$(NULL)
eazel_register_LDFLAGS = \
eazel_register_LDADD = \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(GCONF_LIBS) \

View file

@ -34,7 +34,7 @@ nautilus_summary_view_SOURCES = \
main.c \
$(NULL)
nautilus_summary_view_LDFLAGS = \
nautilus_summary_view_LDADD = \
$(top_builddir)/components/services/summary/lib/libsummary_corba.a \
$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
$(top_builddir)/libnautilus/libnautilus.la \

View file

@ -54,15 +54,12 @@ eazel_time_SOURCES = \
trilobite-eazel-time-service-stubs.c \
$(NULL)
eazel_time_LDFLAGS = \
eazel_time_LDADD = \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(GCONF_LIBS) \
$(VFS_LIBS) \
$(OAF_LIBS) \
$(NULL)
eazel_time_LDADD = \
$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
$(NULL)

View file

@ -63,12 +63,8 @@ trilobite_eazel_time_view_SOURCES = \
main.c \
${NULL}
trilobite_eazel_time_view_LDADD = \
trilobite_eazel_time_view_LDADD = \
$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
$(NULL)
trilobite_eazel_time_view_LDFLAGS = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \

View file

@ -15,21 +15,18 @@ INCLUDES = \
$(NULL)
bin_PROGRAMS = \
trilobite-eazel-sample-client
eazel-sample-client
trilobite_eazel_sample_client_SOURCES = \
eazel_sample_client_SOURCES = \
main.c \
$(NULL)
trilobite_eazel_sample_client_LDFLAGS = \
eazel_sample_client_LDADD = \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(GCONF_LIBS) \
$(VFS_LIBS) \
$(OAF_LIBS) \
$(NULL)
trilobite_eazel_sample_client_LDADD = \
$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
$(top_builddir)/components/services/trilobite/sample/lib/libsample_corba.a \
$(NULL)

View file

@ -32,7 +32,7 @@ nautilus_sample_service_view_SOURCES = \
main.c \
$(NULL)
nautilus_sample_service_view_LDFLAGS = \
nautilus_sample_service_view_LDADD = \
$(top_builddir)/components/services/trilobite/sample/lib/libsample_corba.a \
$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
$(top_builddir)/libnautilus/libnautilus.la \

View file

@ -22,15 +22,12 @@ eazel_vault_SOURCES = \
vault-operations.c \
$(NULL)
eazel_vault_LDFLAGS = \
eazel_vault_LDADD = \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(GCONF_LIBS) \
$(VFS_LIBS) \
$(OAF_LIBS) \
$(NULL)
eazel_vault_LDADD = \
$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
$(top_builddir)/components/services/vault/lib/libvault_corba.a \
$(NULL)

View file

@ -32,7 +32,7 @@ nautilus_vault_view_SOURCES = \
main.c \
$(NULL)
nautilus_vault_view_LDFLAGS = \
nautilus_vault_view_LDADD = \
$(top_builddir)/components/services/vault/lib/libvault_corba.a \
$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
$(top_builddir)/libnautilus/libnautilus.la \

View file

@ -25,7 +25,7 @@ nautilus_tree_view_SOURCES = \
nautilus-tree-view.c \
main.c
nautilus_tree_view_LDFLAGS = \
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 \

View file

@ -19,7 +19,7 @@ nautilus_authenticate_SOURCES =\
nautilus-authenticate-fork.c \
$(NULL)
nautilus_authenticate_LDFLAGS = \
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 \

View file

@ -69,13 +69,13 @@ EXTRA_DIST = \
# build an .so with statically linked -liberty
# LIBLEAKCHECK_STATIC_LIBS = "-Wl,-Bstatic -lbfd -liberty -Wl,-Bdynamic"
#libleakcheck_la_LDFLAGS = -module -avoid-version $(LIBLEAKCHECK_STATIC_LIBS)
#libleakcheck_la_LDADD = -module -avoid-version $(LIBLEAKCHECK_STATIC_LIBS)
#libleakcheck_la_LIBADD = -ldl
# libleakcheck.la: $(libleakcheck_la_OBJECTS) $(libleakcheck_la_DEPENDENCIES)
# $(LINK) -rpath $(libdir) $(libleakcheck_la_LDFLAGS) $(libleakcheck_la_OBJECTS) $(libleakcheck_la_LIBADD) $(LIBS)
# $(LINK) -rpath $(libdir) $(libleakcheck_la_LDADD) $(libleakcheck_la_OBJECTS) $(libleakcheck_la_LIBADD) $(LIBS)
# for now just hardcode a plain old link line, someday someone can