updated wrappers around the new otk widget system and style system

[chaz/openbox] / otk / Makefile.am

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 504319a7c9cf708d2f8ac0bd9ab7ea0446dd7b9e..0c463b5c60e913bb9048c924a45ab0024411d97d 100644 (file)
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -4,18 +4,17 @@ pkgconfigdir = $(libdir)/pkgconfig
 
 CPPFLAGS=$(XFT_CFLAGS) @CPPFLAGS@ -DBUTTONSDIR=\"$(buttonsdir)\"
 
-#noinst_LIBRARIES=libotk.a
 lib_LTLIBRARIES=libotk.la
 
-libotk_la_SOURCES=rendercontrol.cc truerendercontrol.cc surface.cc \
+libotk_la_SOURCES=rendercontrol.cc truerendercontrol.cc surface.cc util.cc \
                   renderstyle.cc rendercolor.cc pseudorendercontrol.cc \
-                  display.cc font.cc \
-                  property.cc rect.cc screeninfo.cc \
-                  timer.cc \
-                  util.cc widget.cc focuswidget.cc \
-                  button.cc eventhandler.cc eventdispatcher.cc ustring.cc \
-                  label.cc focuslabel.cc application.cc appwidget.cc
-includeotk_HEADERS=application.hh appwidget.hh assassin.hh button.hh \
+                  display.cc font.cc screeninfo.cc property.cc timer.cc \
+                  eventdispatcher.cc eventhandler.cc ustring.cc \
+                  widget.cc application.cc label.cc appwidget.cc button.cc
+
+#focuswidget.cc focuslabel.cc
+
+includeotk_HEADERS=application.hh appwidget.hh assassin.hh button.hh size.hh \
                    display.hh eventdispatcher.hh eventhandler.hh \
                    focuslabel.hh focuswidget.hh font.hh label.hh otk.hh \
                    point.hh property.hh pseudorendercontrol.hh rect.hh \