WE DONT USE BASE DISPLAY FOR ANYTHING ANY MORE!!@^!*@*!! YAY

[chaz/openbox] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index f0a7ca7d3a6a2e3f169f013133905b191c7c2d0e..4a5ea177251c76770da5a676f07d86bf59a8de35 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,16 +1,23 @@
+localedir=$(datadir)/locale
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
-CXXFLAGS=`pkg-config --cflags xft` @CXXFLAGS@ \
+CPPFLAGS=`pkg-config --cflags xft` @CPPFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
--Dmultibyte\(\)=True
+-DLOCALEDIR=\"$(localedir)\"
 
 LDFLAGS=`pkg-config --libs xft`
 
+INCLUDES= -I../otk
+
 bin_PROGRAMS= openbox
 
-openbox_SOURCES= basedisplay.cc color.cc configuration.cc font.cc gccache.cc image.cc imagecontrol.cc screen.cc texture.cc timer.cc util.cc window.cc workspace.cc xatom.cc blackbox.cc main.cc
+openbox_LDADD=../otk/libotk.a @LIBINTL@
+
+openbox_SOURCES= configuration.cc screen.cc openbox.cc \
+                 timer.cc util.cc window.cc workspace.cc xatom.cc blackbox.cc \
+                 main.cc
 
 MAINTAINERCLEANFILES= Makefile.in