diff options
| author | Dana Jansens <danakj@orodu.net> | 2002-11-01 03:45:34 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2002-11-01 03:45:34 +0000 |
| commit | 1824e6b1006397ae3233dc164d3d026c54a20bb3 (patch) | |
| tree | d53bfe7120855f71177976d600d33275722d89bf | |
| parent | bca71305271412280e963bf6eb09c31ce83fc765 (diff) | |
add a cvsignore for otk.
make sexier automake shit
| -rw-r--r-- | otk/.cvsignore | 3 | ||||
| -rw-r--r-- | otk/Makefile.am | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 11 |
3 files changed, 10 insertions, 12 deletions
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 |