set the ustring's utf type so that it matches what it appended to it

[chaz/openbox] / otk / Makefile.am

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 8ca32e171913efe17905b8e3c34b9f03e2e25584..dc84e0e273d783e1ea661a31014fb9074c4d8874 100644 (file)
--- 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,16 +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 \
+                  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)
-
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local: