From: Dana Jansens <danakj@orodu.net>
Date: Fri, 1 Nov 2002 04:02:33 +0000 (+0000)
Subject: make compile again
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=f127273aba3670fb4bca54d3521caf5bd189154e;p=chaz%2Fopenbox

make compile again
---

diff --git a/otk/Makefile.am b/otk/Makefile.am
index c6c600a8..e9193eba 100644
--- 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 33c4b9d7..bc533a2b 100644
--- 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