X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2FMakefile.am;h=dc84e0e273d783e1ea661a31014fb9074c4d8874;hb=4c71c71d57e87c5273e09976fbac5b3a2f83bc52;hp=a65458dcb34cc202674ef34d578a1cf2ad6fa070;hpb=915b171befc55dc12daffe5814cdf6332083f2ad;p=chaz%2Fopenbox

diff --git a/otk/Makefile.am b/otk/Makefile.am
index a65458dc..dc84e0e2 100644
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -1,6 +1,7 @@
-scriptdir = $(libdir)/openbox/python
+buttonsdir = $(pkgdatadir)/buttons
 
-CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@
+CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \
+-DBUTTONSDIR=\"$(buttonsdir)\"
 
 INCLUDES= -I../src
 
@@ -11,14 +12,12 @@ libotk_la_SOURCES= 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 \
                   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)
 
-scriptdir_DATA = otk.py
-
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local:
@@ -27,11 +26,11 @@ distclean-local:
 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.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 \