From: Dana Jansens <danakj@orodu.net>
Date: Fri, 1 Nov 2002 03:45:34 +0000 (+0000)
Subject: add a cvsignore for otk.
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=1824e6b1006397ae3233dc164d3d026c54a20bb3;p=chaz%2Fopenbox

add a cvsignore for otk.
make sexier automake shit
---

diff --git a/otk/.cvsignore b/otk/.cvsignore
new file mode 100644
index 00000000..051d1bd5
--- /dev/null
+++ b/otk/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+.deps
diff --git a/otk/Makefile.am b/otk/Makefile.am
index 835874d5..c6c600a8 100644
--- 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 72645d2f..33c4b9d7 100644
--- 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