A otk/.cvsignore

@@ -0,0 +1,3 @@ 
+Makefile
+Makefile.in
+.deps

M otk/Makefile.am → otk/Makefile.am

@@ -1,9 +1,4 @@ 
-DEFAULT_MENU=$(pkgdatadir)/menu
-DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
-
 CXXFLAGS=`pkg-config --cflags xft` @CXXFLAGS@ \
--DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
--DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
 -Dmultibyte\(\)=True
 
 INCLUDES= -I../src
@@ -12,7 +7,8 @@ LDFLAGS=`pkg-config --libs xft`
 
 noinst_LIBRARIES=libotk.a
 
-libotk_a_SOURCES= color.cc font.cc gccache.cc image.cc imagecontrol.cc texture.cc
+libotk_a_SOURCES= color.cc font.cc gccache.cc image.cc imagecontrol.cc \
+                  texture.cc
 
 MAINTAINERCLEANFILES= Makefile.in
 

M src/Makefile.am → src/Makefile.am

@@ -1,19 +1,18 @@ 
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
-CXXFLAGS=`pkg-config --cflags xft` @CXXFLAGS@ \
+CXXFLAGS=@CXXFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
--DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
--Dmultibyte\(\)=True
-
-LDFLAGS=`pkg-config --libs xft`
+-DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\"
 
 INCLUDES= -I../otk
 
 bin_PROGRAMS= openbox
 
 openbox_LDADD=../otk/libotk.a
-openbox_SOURCES= basedisplay.cc configuration.cc screen.cc timer.cc util.cc window.cc workspace.cc xatom.cc blackbox.cc main.cc
+
+openbox_SOURCES= basedisplay.cc configuration.cc screen.cc timer.cc util.cc \
+                 window.cc workspace.cc xatom.cc blackbox.cc main.cc
 
 MAINTAINERCLEANFILES= Makefile.in