X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=70c7013aa118a3a84bb5cb0b7f399f3a1fc1f935;hb=9247a7a616809e45bd26774d5aed7d24c618e6f2;hp=3fb5cb5e4ff5454fd64ff1c89ba728faf1e64e7c;hpb=3dcebcf56c6dd3a3707291e757af485bb55df7a6;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index 3fb5cb5e..70c7013a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,112 +1,55 @@
-# src/Makefile.am for Openbox
-# Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the 
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in 
-# all copies or substantial portions of the Software. 
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
-# DEALINGS IN THE SOFTWARE.
-
 DEFAULT_MENU=$(pkgdatadir)/menu
-DEFAULT_STYLE=$(pkgdatadir)/styles/steelblue
+DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
-CPPFLAGS= @CPPFLAGS@ @SHAPE@ @SLIT@ @INTERLACE@ @ORDEREDPSEUDO@ \
-@DEBUG@ @NEWWMSPEC@ @NLS@ @TIMEDCACHE@ @CLOBBER@ \
--DLOCALEPATH=\"$(pkgdatadir)/nls\" \
+CXXFLAGS=`pkg-config --cflags xft` @CXXFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
--DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\"
+-DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
+-Dmultibyte\(\)=True
+
+LDFLAGS=`pkg-config --libs xft`
 
 bin_PROGRAMS= openbox
 
-openbox_SOURCES= BaseDisplay.cc Basemenu.cc Clientmenu.cc Configmenu.cc Geometry.cc Iconmenu.cc Image.cc LinkedList.cc Netizen.cc Resource.cc Rootmenu.cc Screen.cc Slit.cc Timer.cc Toolbar.cc Window.cc Windowmenu.cc Workspace.cc Workspacemenu.cc openbox.cc bsd-snprintf.c i18n.cc main.cc
+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
 
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local:
-	rm -f *\~ *.orig *.rej
+	rm -f *\~ *.orig *.rej .\#*
 
 # local dependencies
-
-BaseDisplay.o: BaseDisplay.cc i18n.h BaseDisplay.h LinkedList.h \
- Timer.h
-Basemenu.o: Basemenu.cc i18n.h openbox.h BaseDisplay.h \
- LinkedList.h Timer.h Image.h Iconmenu.h Basemenu.h \
- Windowmenu.h Slit.h Screen.h Configmenu.h Netizen.h Rootmenu.h \
- Workspace.h Workspacemenu.h Resource.h
-Clientmenu.o: Clientmenu.cc openbox.h BaseDisplay.h LinkedList.h \
- Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \
- Clientmenu.h Workspace.h Screen.h Configmenu.h Netizen.h \
- Rootmenu.h Workspacemenu.h Resource.h Geometry.h
-Configmenu.o: Configmenu.cc i18n.h Configmenu.h Basemenu.h \
- LinkedList.h Screen.h BaseDisplay.h Timer.h Iconmenu.h Netizen.h \
- Rootmenu.h Workspace.h Workspacemenu.h openbox.h Image.h \
- Window.h Windowmenu.h Slit.h Toolbar.h Resource.h Geometry.h
-Geometry.o: Geometry.cc Geometry.h
-Icon.o: Iconmenu.cc i18n.h openbox.h BaseDisplay.h LinkedList.h \
- Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \
- Screen.h Configmenu.h Netizen.h Rootmenu.h Workspace.h \
- Workspacemenu.h Toolbar.h Resource.h Geometry.h
-Image.o: Image.cc i18n.h BaseDisplay.h LinkedList.h Timer.h \
- Image.h
-LinkedList.o: LinkedList.cc LinkedList.h
-Netizen.o: Netizen.cc Netizen.h BaseDisplay.h LinkedList.h Timer.h \
- Screen.h Configmenu.h Basemenu.h openbox.h Image.h Window.h \
- Iconmenu.h Windowmenu.h Slit.h Rootmenu.h Workspace.h \
- Workspacemenu.h Resource.h Geometry.h
-Resource.o: Resource.cc Resource.h Util.h
-Rootmenu.o: Rootmenu.cc openbox.h BaseDisplay.h LinkedList.h \
- Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \
- Rootmenu.h Screen.h Configmenu.h Netizen.h Workspace.h \
- Workspacemenu.h Resource.h Geometry.h
-Screen.o: Screen.cc i18n.h bsd-snprintf.h openbox.h BaseDisplay.h \
- LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \
- Windowmenu.h Slit.h Clientmenu.h Workspace.h Screen.h Configmenu.h \
- Netizen.h Rootmenu.h Workspacemenu.h Toolbar.h Resource.h Geometry.h
-Slit.o: Slit.cc i18n.h openbox.h BaseDisplay.h LinkedList.h \
- Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \
- Screen.h Configmenu.h Netizen.h Rootmenu.h Workspace.h \
- Workspacemenu.h Toolbar.h Resource.h Geometry.h
-Timer.o: Timer.cc BaseDisplay.h LinkedList.h Timer.h
-Toolbar.o: Toolbar.cc i18n.h openbox.h BaseDisplay.h LinkedList.h \
- Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \
- Clientmenu.h Workspace.h Rootmenu.h Screen.h Configmenu.h \
- Netizen.h Workspacemenu.h Toolbar.h Resource.h Geometry.h
-Window.o: Window.cc i18n.h openbox.h BaseDisplay.h LinkedList.h \
- Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \
- Screen.h Configmenu.h Netizen.h Rootmenu.h Workspace.h \
- Workspacemenu.h Toolbar.h Resource.h Geometry.h
-Windowmenu.o: Windowmenu.cc i18n.h openbox.h BaseDisplay.h \
- LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \
- Windowmenu.h Slit.h Screen.h Configmenu.h Netizen.h Rootmenu.h \
- Workspace.h Workspacemenu.h Resource.h Geometry.h
-Workspace.o: Workspace.cc i18n.h openbox.h BaseDisplay.h \
- LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \
- Windowmenu.h Slit.h Clientmenu.h Workspace.h Screen.h \
- Configmenu.h Netizen.h Rootmenu.h Workspacemenu.h Toolbar.h Resource.h \
- Geometry.h Geometry.h Util.h
-Workspacemenu.o: Workspacemenu.cc i18n.h openbox.h BaseDisplay.h \
- LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \
- Windowmenu.h Slit.h Screen.h Configmenu.h Netizen.h Rootmenu.h \
- Workspace.h Workspacemenu.h Toolbar.h Resource.h Geometry.h
-openbox.o: openbox.cc i18n.h openbox.h BaseDisplay.h \
- LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \
- Windowmenu.h Slit.h Clientmenu.h Workspace.h Rootmenu.h \
- Screen.h Configmenu.h Netizen.h Workspacemenu.h Toolbar.h Resource.h \
- Geometry.h Util.h
-bsd-snprintf.o: bsd-snprintf.c bsd-snprintf.h
-i18n.o: i18n.cc i18n.h
-main.o: main.cc ../version.h i18n.h openbox.h BaseDisplay.h \
- LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \
- Windowmenu.h Slit.h Resource.h Geometry.h
+basedisplay.o: basedisplay.cc basedisplay.hh timer.hh util.hh \
+ gccache.hh color.hh
+blackbox.o: blackbox.cc blackbox.hh basedisplay.hh timer.hh util.hh \
+ configuration.hh xatom.hh gccache.hh color.hh image.hh screen.hh \
+ texture.hh workspace.hh window.hh
+color.o: color.cc color.hh basedisplay.hh timer.hh util.hh
+configuration.o: configuration.cc configuration.hh util.hh
+font.o: font.cc font.hh screen.hh color.hh texture.hh util.hh image.hh \
+ timer.hh basedisplay.hh workspace.hh xatom.hh blackbox.hh \
+ configuration.hh gccache.hh
+gccache.o: gccache.cc gccache.hh basedisplay.hh timer.hh util.hh \
+ color.hh
+image.o: image.cc blackbox.hh basedisplay.hh timer.hh util.hh \
+ configuration.hh xatom.hh gccache.hh color.hh image.hh texture.hh
+imagecontrol.o: imagecontrol.cc blackbox.hh basedisplay.hh timer.hh \
+ util.hh configuration.hh xatom.hh color.hh image.hh texture.hh
+main.o: main.cc ../version.h blackbox.hh basedisplay.hh timer.hh \
+ util.hh configuration.hh xatom.hh
+screen.o: screen.cc blackbox.hh basedisplay.hh timer.hh util.hh \
+ configuration.hh xatom.hh font.hh screen.hh color.hh texture.hh \
+ image.hh workspace.hh gccache.hh window.hh
+texture.o: texture.cc texture.hh color.hh util.hh basedisplay.hh \
+ timer.hh image.hh screen.hh workspace.hh xatom.hh blackbox.hh \
+ configuration.hh
+timer.o: timer.cc basedisplay.hh timer.hh util.hh
+util.o: util.cc util.hh
+window.o: window.cc blackbox.hh basedisplay.hh timer.hh util.hh \
+ configuration.hh xatom.hh font.hh screen.hh color.hh texture.hh \
+ image.hh workspace.hh gccache.hh window.hh
+workspace.o: workspace.cc blackbox.hh basedisplay.hh timer.hh util.hh \
+ configuration.hh xatom.hh font.hh screen.hh color.hh texture.hh \
+ image.hh workspace.hh window.hh
+xatom.o: xatom.cc ../config.h xatom.hh screen.hh color.hh texture.hh \
+ util.hh image.hh timer.hh basedisplay.hh workspace.hh blackbox.hh \
+ configuration.hh