1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
|
Description: fix library link order
Author: Kamal Mostafa <kamal@whence.com>
Bug-Ubuntu: https://launchpad.net/bugs/832865
Fix FTBFS due to improper use of AM_ variables, resulting in incorrect
library ordering on the link line.
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -83,7 +83,7 @@
twpskDiags.$(OBJEXT) twpskWF.$(OBJEXT) twpskHelp.$(OBJEXT) \
twpskWids.$(OBJEXT) twpskCB.$(OBJEXT) twpskScope.$(OBJEXT)
twpsk_OBJECTS = $(am_twpsk_OBJECTS)
-twpsk_LDADD = $(LDADD)
+twpsk_DEPENDENCIES =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@@ -251,7 +251,7 @@
AM_CXXFLAGS = -Wall -Wno-write-strings\
-DPKG_DATA_DIR=\"$(pkgdatadir)\"
-AM_LDFLAGS = @MOTIF_LIBS@ @X_LIBS@ @X_PRE_LIBS@ \
+twpsk_LDADD = @MOTIF_LIBS@ @X_LIBS@ @X_PRE_LIBS@ \
-lXt -lX11 @X_EXTRA_LIBS@
pixmapdir = $(datadir)/pixmaps
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,7 @@
AM_CXXFLAGS = -Wall -Wno-write-strings\
-DPKG_DATA_DIR=\"$(pkgdatadir)\"
-AM_LDFLAGS = @MOTIF_LIBS@ @X_LIBS@ @X_PRE_LIBS@ \
+twpsk_LDADD = @MOTIF_LIBS@ @X_LIBS@ @X_PRE_LIBS@ \
-lXt -lX11 @X_EXTRA_LIBS@
pixmapdir = $(datadir)/pixmaps
|