X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2FMakefile.am;h=906a35c067ed52c836f30cc6155d600b522f9d5f;hb=707f70682abe0dfaadbf76843a0dccb33f0eaeda;hp=d2f81ed2efa75747728f22a7507af6fcd317cbfd;hpb=26d95a52860277c118efd95fb251fee28b502d8c;p=chaz%2Fopenbox

diff --git a/otk/Makefile.am b/otk/Makefile.am
index d2f81ed2..906a35c0 100644
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -1,54 +1,55 @@
-scriptdir = $(libdir)/openbox/python
+buttonsdir = $(pkgdatadir)/buttons
 
-CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@
+CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \
+-DBUTTONSDIR=\"$(buttonsdir)\"
 
 INCLUDES= -I../src
 
 #noinst_LIBRARIES=libotk.a
 noinst_LTLIBRARIES=libotk.la
 
-libotk_la_SOURCES= color.cc display.cc font.cc gccache.cc image.cc \
+libotk_la_SOURCES=rendercontrol.cc truerendercontrol.cc surface.cc \
+                  renderstyle.cc rendercolor.cc  \
+                  color.cc display.cc font.cc gccache.cc image.cc \
                   property.cc imagecontrol.cc rect.cc screeninfo.cc \
-                  texture.cc timer.cc timerqueuemanager.cc style.cc \
+                  texture.cc timer.cc style.cc \
                   configuration.cc util.cc widget.cc focuswidget.cc \
-                  button.cc eventhandler.cc eventdispatcher.cc \
-                  label.cc focuslabel.cc application.cc appwidget.cc \
-                  otk_wrap.cc
+                  button.cc eventhandler.cc eventdispatcher.cc ustring.cc \
+                  label.cc focuslabel.cc application.cc appwidget.cc
+#                  otk_wrap.cc
 
-libotk_la_LDFLAGS = $(XFT_LIBS) $(PYTHON_LIBS)
-
-#script_DATA = otk.py
-
-#EXTRA_DIST = $(script_DATA)
+libotk_la_LDFLAGS = $(XFT_LIBS) $(PYTHON_LIBS) @LIBS@
 
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local:
 	rm -f *\~ *.orig *.rej .\#*
 
-otk_test: libotk.a otk_test.cc
-	$(CXX) $(CXXFLAGS) -DHAVE_CONFIG_H -I. -I. -I.. -I../src $(XFT_CFLAGS) -Wall -W -pedantic -DNDEBUG -g -O2 -o otk_test otk_test.cc $(XFT_LIBS) ./libotk.a 
+otk_test: libotk.la otk_test.cc
+	$(CXX) $(CXXFLAGS) -DHAVE_CONFIG_H -I. -I. -I.. -I../src $(XFT_CFLAGS) -Wall -W -pedantic -DNDEBUG -g -O2 -o otk_test otk_test.cc $(XFT_LIBS) .libs/libotk.al @LIBS@
+
+rendertest: libotk.la rendertest.cc
+	$(CXX) $(CXXFLAGS) -DHAVE_CONFIG_H -I. -I. -I.. -I../src $(XFT_CFLAGS) -Wall -W -pedantic -DNDEBUG -g -O2 -o $@ rendertest.cc $(XFT_LIBS) .libs/libotk.al @LIBS@
 
-otk.i: $(wildcard *.hh)
-	touch $@
+#otk.i: $(wildcard *.hh)
+#	touch $@
 
-otk_wrap.cc: otk.i
-	swig $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -o $@ $<
+#otk_wrap.cc: otk.i
+#	swig $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -o $@ $<
 
 # local dependencies
 application.o: application.cc application.hh eventdispatcher.hh \
- eventhandler.hh display.hh configuration.hh timerqueuemanager.hh \
- timerqueue.hh timer.hh image.hh color.hh screeninfo.hh rect.hh \
+ eventhandler.hh display.hh configuration.hh \
+ timer.hh image.hh color.hh screeninfo.hh rect.hh \
  point.hh style.hh font.hh texture.hh util.hh widget.hh
 appwidget.o: appwidget.cc appwidget.hh widget.hh rect.hh point.hh \
  texture.hh color.hh util.hh style.hh font.hh image.hh screeninfo.hh \
  timer.hh configuration.hh eventdispatcher.hh eventhandler.hh \
- application.hh display.hh timerqueuemanager.hh timerqueue.hh
+ application.hh display.hh 
 button.o: button.cc button.hh focuslabel.hh focuswidget.hh widget.hh \
  rect.hh point.hh texture.hh color.hh util.hh style.hh font.hh \
  image.hh screeninfo.hh timer.hh configuration.hh eventdispatcher.hh \
- eventhandler.hh application.hh display.hh timerqueuemanager.hh \
- timerqueue.hh
+ eventhandler.hh application.hh display.hh 
 color.o: color.cc color.hh display.hh screeninfo.hh rect.hh point.hh
 configuration.o: configuration.cc configuration.hh util.hh
 eventdispatcher.o: eventdispatcher.cc eventdispatcher.hh \
@@ -57,13 +58,11 @@ eventhandler.o: eventhandler.cc eventhandler.hh
 focuslabel.o: focuslabel.cc focuslabel.hh focuswidget.hh widget.hh \
  rect.hh point.hh texture.hh color.hh util.hh style.hh font.hh \
  image.hh screeninfo.hh timer.hh configuration.hh eventdispatcher.hh \
- eventhandler.hh application.hh display.hh timerqueuemanager.hh \
- timerqueue.hh
+ eventhandler.hh application.hh display.hh
 focuswidget.o: focuswidget.cc focuswidget.hh widget.hh rect.hh \
  point.hh texture.hh color.hh util.hh style.hh font.hh image.hh \
  screeninfo.hh timer.hh configuration.hh eventdispatcher.hh \
- eventhandler.hh application.hh display.hh timerqueuemanager.hh \
- timerqueue.hh
+ eventhandler.hh application.hh display.hh 
 font.o: font.cc font.hh util.hh display.hh color.hh screeninfo.hh \
  rect.hh point.hh
 gccache.o: gccache.cc gccache.hh display.hh color.hh assassin.hh \
@@ -75,10 +74,10 @@ imagecontrol.o: imagecontrol.cc display.hh color.hh image.hh \
 label.o: label.cc label.hh widget.hh rect.hh point.hh texture.hh \
  color.hh util.hh style.hh font.hh image.hh screeninfo.hh timer.hh \
  configuration.hh eventdispatcher.hh eventhandler.hh application.hh \
- display.hh timerqueuemanager.hh timerqueue.hh
+ display.hh 
 otk_test.o: otk_test.cc application.hh eventdispatcher.hh \
- eventhandler.hh display.hh configuration.hh timerqueuemanager.hh \
- timerqueue.hh timer.hh image.hh color.hh screeninfo.hh rect.hh \
+ eventhandler.hh display.hh configuration.hh \
+ timer.hh image.hh color.hh screeninfo.hh rect.hh \
  point.hh style.hh font.hh texture.hh util.hh focuswidget.hh widget.hh \
  appwidget.hh button.hh focuslabel.hh
 property.o: property.cc property.hh screeninfo.hh rect.hh point.hh \
@@ -91,11 +90,9 @@ style.o: style.cc display.hh util.hh style.hh color.hh font.hh \
  configuration.hh
 texture.o: texture.cc texture.hh color.hh util.hh display.hh image.hh \
  screeninfo.hh rect.hh point.hh timer.hh
-timer.o: timer.cc timer.hh timerqueuemanager.hh timerqueue.hh
-timerqueuemanager.o: timerqueuemanager.cc timerqueuemanager.hh \
- timerqueue.hh timer.hh display.hh
+timer.o: timer.cc timer.hh
 util.o: util.cc util.hh
 widget.o: widget.cc widget.hh rect.hh point.hh texture.hh color.hh \
  util.hh style.hh font.hh image.hh screeninfo.hh timer.hh \
  configuration.hh eventdispatcher.hh eventhandler.hh application.hh \
- display.hh timerqueuemanager.hh timerqueue.hh assassin.hh
+ display.hh assassin.hh