add a cvsignore for otk.

make sexier automake shit

diff --git a/otk/.cvsignore b/otk/.cvsignore
new file mode 100644 (file)
index 0000000..051d1bd
--- /dev/null
+++ b/otk/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+.deps

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 835874d5124fe23ca20cce53d93ba5d776def946..c6c600a83ffa4aaab8682529dc581d149c0ecb37 100644 (file)
--- a/otk/Makefile.am
+++ b/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
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 72645d2fca9dab77540db4619f6ec0b4a2f1412c..33c4b9d7ec881c69b2950eb76f2d4a932523e382 100644 (file)
--- a/src/Makefile.am
+++ b/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