make compile again

diff --git a/otk/Makefile.am b/otk/Makefile.am
index c6c600a83ffa4aaab8682529dc581d149c0ecb37..e9193ebac6985be97c06c57ad15d1b3418e802be 100644 (file)
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -3,8 +3,6 @@ CXXFLAGS=`pkg-config --cflags xft` @CXXFLAGS@ \
 
 INCLUDES= -I../src
 
-LDFLAGS=`pkg-config --libs xft`
-
 noinst_LIBRARIES=libotk.a
 
 libotk_a_SOURCES= color.cc font.cc gccache.cc image.cc imagecontrol.cc \

diff --git a/src/Makefile.am b/src/Makefile.am
index 33c4b9d7ec881c69b2950eb76f2d4a932523e382..bc533a2b228ae435b0a5e8960fee302591591766 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,12 @@
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
-CXXFLAGS=@CXXFLAGS@ \
+CXXFLAGS=`pkg-config --cflags xft` @CXXFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\"
 
+LDFLAGS=`pkg-config --libs xft`
+
 INCLUDES= -I../otk
 
 bin_PROGRAMS= openbox