merge the C branch into HEAD

[chaz/openbox] / otk / Makefile.am

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 504319a7c9cf708d2f8ac0bd9ab7ea0446dd7b9e..58fe305d83a4abde554a723623f0f8fe99f087a2 100644 (file)
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -4,25 +4,24 @@ 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
+                  display.cc font.cc property.cc timer.cc \
+                  eventdispatcher.cc eventhandler.cc ustring.cc \
+                  widget.cc application.cc label.cc appwidget.cc button.cc \
+                  otk.cc messagedialog.cc
+
+#focuswidget.cc focuslabel.cc
+
 includeotk_HEADERS=application.hh appwidget.hh assassin.hh button.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 \
-                   rendercolor.hh rendercontrol.hh renderstyle.hh \
-                   rendertexture.hh screeninfo.hh strut.hh surface.hh \
+                   display.hh eventdispatcher.hh eventhandler.hh font.hh \
+                   label.hh otk.hh point.hh property.hh pseudorendercontrol.hh\
+                   rect.hh rendercolor.hh rendercontrol.hh renderstyle.hh \
+                   rendertexture.hh size.hh strut.hh surface.hh \
                    timer.hh truerendercontrol.hh ustring.hh util.hh widget.hh \
-                   ../config.h
+                   messagedialog.hh ../config.h
 
 EXTRA_DIST = otk.pc.in