Mercurial > pidgin
comparison libgaim/protocols/zephyr/Makefile.am @ 14674:69590c55c748
[gaim-migrate @ 17420]
It is more correct to use foo_la_LIBADD to specify libs to link to instead
of foo_la_LDFLAGS
committer: Tailor Script <tailor@pidgin.im>
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Sun, 01 Oct 2006 18:17:49 +0000 |
parents | 60b1bc8dbf37 |
children |
comparison
equal
deleted
inserted
replaced
14673:a2b56d168a88 | 14674:69590c55c748 |
---|---|
71 | 71 |
72 ZEPHYRLIBS = $(KRB4_LDFLAGS) $(KRB4_LIBS) | 72 ZEPHYRLIBS = $(KRB4_LDFLAGS) $(KRB4_LIBS) |
73 | 73 |
74 ZEPHYRLIBSEXT = $(ZEPHYR_LDFLAGS) $(ZEPHYR_LIBS) | 74 ZEPHYRLIBSEXT = $(ZEPHYR_LDFLAGS) $(ZEPHYR_LIBS) |
75 | 75 |
76 libzephyr_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS) | 76 libzephyr_la_LDFLAGS = -module -avoid-version |
77 | 77 |
78 if STATIC_ZEPHYR | 78 if STATIC_ZEPHYR |
79 | 79 |
80 st = -DGAIM_STATIC_PRPL -Dlint | 80 st = -DGAIM_STATIC_PRPL -Dlint |
81 noinst_LIBRARIES = libzephyr.a | 81 noinst_LIBRARIES = libzephyr.a |
88 st = -Dlint | 88 st = -Dlint |
89 pkg_LTLIBRARIES = libzephyr.la | 89 pkg_LTLIBRARIES = libzephyr.la |
90 | 90 |
91 if EXTERNAL_LIBZEPHYR | 91 if EXTERNAL_LIBZEPHYR |
92 libzephyr_la_SOURCES = $(ZEPHYRSOURCESEXT) | 92 libzephyr_la_SOURCES = $(ZEPHYRSOURCESEXT) |
93 libzephyr_la_LIBADD = $(ZEPHYRLIBSEXT) | 93 libzephyr_la_LIBADD = $(GLIB_LIBS) $(ZEPHYRLIBSEXT) |
94 else | 94 else |
95 libzephyr_la_SOURCES = $(ZEPHYRSOURCES) | 95 libzephyr_la_SOURCES = $(ZEPHYRSOURCES) |
96 libzephyr_la_LIBADD = $(ZEPHYRLIBS) | 96 libzephyr_la_LIBADD = $(GLIB_LIBS) $(ZEPHYRLIBS) |
97 endif | 97 endif |
98 | 98 |
99 | 99 |
100 endif | 100 endif |
101 | 101 |