Skip to content

Commit

Permalink
Fix how link dependencies are specified
Browse files Browse the repository at this point in the history
Several target have their dependencies incorrectly reported in _LDFLAGS
variables instead of _LIBADD or _LDADD. As a result, the link flag
-Wl,--as-needed (when used) is misplaced making it useless. This patch
sanetizes this a little bit.
  • Loading branch information
nbourdau committed Jul 29, 2012
1 parent 5b452df commit ff3e46a
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion src/Makefile-hotplug-sniffer.am
Expand Up @@ -15,7 +15,7 @@ cinnamon_hotplug_sniffer_CFLAGS = \
$(CINNAMON_HOTPLUG_SNIFFER_CFLAGS) \
$(NULL)

cinnamon_hotplug_sniffer_LDFLAGS = \
cinnamon_hotplug_sniffer_LDADD = \
$(CINNAMON_HOTPLUG_SNIFFER_LIBS) \
$(NULL)

Expand Down
1 change: 0 additions & 1 deletion src/Makefile-st.am
Expand Up @@ -175,7 +175,6 @@ libst_1_0_la_SOURCES = \
$(st_built_sources) \
$(NULL)
libst_1_0_la_CPPFLAGS = $(st_cflags)
libst_1_0_la_LDFLAGS = $(LDADD)

noinst_PROGRAMS += test-theme

Expand Down
1 change: 0 additions & 1 deletion src/Makefile-tray.am
Expand Up @@ -49,7 +49,6 @@ libtray_la_SOURCES = \
$(tray_built_sources) \
$(NULL)
libtray_la_CPPFLAGS = $(tray_cflags)
libtray_la_LDFLAGS = $(LDADD)

CLEANFILES += $(TRAY_STAMP_FILES) $(BUILT_SOURCES)

Expand Down

0 comments on commit ff3e46a

Please sign in to comment.