From 2f14783cc45bc9f1c27bf1b44d29335ff3f841af Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 26 Feb 2012 18:14:33 +0100 Subject: [PATCH] frontends: change the order in which libraries are linked Currently, it is almost impossible to statically link the frontends, because the order in which libraries are linked is incorrect. Signed-off-by: "Yann E. MORIN" --- frontends/gconf/Makefile.am | 4 ++-- frontends/mconf/Makefile.am | 6 +++--- frontends/nconf/Makefile.am | 4 ++-- frontends/qconf/Makefile.am | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontends/gconf/Makefile.am b/frontends/gconf/Makefile.am index be0c7b9..d016ce8 100644 --- a/frontends/gconf/Makefile.am +++ b/frontends/gconf/Makefile.am @@ -8,7 +8,7 @@ gconf_CPPFLAGS = $(AM_CPPFLAGS) \ -DGUI_PATH='"$(pkgdatadir)/gconf.glade"' gconf_CFLAGS = $(AM_CFLAGS) \ $(gtk_CFLAGS) -gconf_LDADD = $(gtk_LIBS) \ - ../../libs/parser/libkconfigparser.la +gconf_LDADD = ../../libs/parser/libkconfigparser.la \ + $(gtk_LIBS) gconfdir = $(pkgdatadir) gconf_DATA = gconf.glade diff --git a/frontends/mconf/Makefile.am b/frontends/mconf/Makefile.am index abf99ad..4da73b7 100644 --- a/frontends/mconf/Makefile.am +++ b/frontends/mconf/Makefile.am @@ -6,6 +6,6 @@ mconf_CPPFLAGS = $(AM_CPPFLAGS) \ $(GETTEXT) \ -I../../libs \ -I../../libs/parser -mconf_LDADD = ${ncurses_LIBS} \ - ../../libs/parser/libkconfigparser.la \ - ../../libs/lxdialog/liblxdialog.a +mconf_LDADD = ../../libs/parser/libkconfigparser.la \ + ../../libs/lxdialog/liblxdialog.a \ + ${ncurses_LIBS} diff --git a/frontends/nconf/Makefile.am b/frontends/nconf/Makefile.am index 6391b9e..8ed6f9f 100644 --- a/frontends/nconf/Makefile.am +++ b/frontends/nconf/Makefile.am @@ -4,5 +4,5 @@ nconf_SOURCES = nconf.c nconf.gui.c nconf.h nconf_CPPFLAGS = $(AM_CPPFLAGS) \ $(GETTEXT) \ -I../../libs/parser -nconf_LDADD = ${ncurses_LIBS} ${ncurses_extra_LIBS} \ - ../../libs/parser/libkconfigparser.la +nconf_LDADD = ../../libs/parser/libkconfigparser.la \ + ${ncurses_extra_LIBS} ${ncurses_LIBS} diff --git a/frontends/qconf/Makefile.am b/frontends/qconf/Makefile.am index a27bab1..fabfaeb 100644 --- a/frontends/qconf/Makefile.am +++ b/frontends/qconf/Makefile.am @@ -8,8 +8,8 @@ qconf_CPPFLAGS = $(AM_CPPFLAGS) \ -I../../libs/images qconf_CXXFLAGS = $(AM_CXXFLAGS) \ $(qt4_CFLAGS) -qconf_LDADD = $(qt4_LIBS) \ - ../../libs/parser/libkconfigparser.la +qconf_LDADD = ../../libs/parser/libkconfigparser.la \ + $(qt4_LIBS) .h.moc: moc -i $< -o $@ -- 2.39.5