settings can't be NULL here, or we'd have already crashed anyway

[dana/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bcd7ba0..12176d6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,6 +69,7 @@ obrender_libobrender_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(XML_CFLAGS) \
        $(PANGO_CFLAGS) \
+       $(IMLIB2_CFLAGS) \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
 obrender_libobrender_la_LDFLAGS = \
@@ -77,6 +78,7 @@ obrender_libobrender_la_LIBADD = \
        $(X_LIBS) \
        $(PANGO_LIBS) \
        $(GLIB_LIBS) \
+       $(IMLIB2_LIBS) \
        $(XML_LIBS)
 obrender_libobrender_la_SOURCES = \
        gettext.h \
@@ -126,24 +128,27 @@ obt_libobt_la_LIBADD = \
        $(GLIB_LIBS) \
        $(XML_LIBS)
 obt_libobt_la_SOURCES = \
+       obt/bsearch.h \
        obt/display.h \
        obt/display.c \
        obt/internal.h \
        obt/keyboard.h \
        obt/keyboard.c \
-       obt/mainloop.h \
-       obt/mainloop.c \
        obt/xml.h \
        obt/xml.c \
-       obt/ddfile.h \
-       obt/ddfile.c \
+       obt/ddparse.h \
+       obt/ddparse.c \
+       obt/link.h \
+       obt/link.c \
        obt/paths.h \
        obt/paths.c \
        obt/prop.h \
        obt/prop.c \
        obt/util.h \
-       obt/xevent.h \
-       obt/xevent.c
+       obt/watch.h \
+       obt/watch.c \
+       obt/xqueue.h \
+       obt/xqueue.c
 
 ## openbox ##
 
@@ -156,7 +161,6 @@ openbox_openbox_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(LIBSN_CFLAGS) \
        $(XML_CFLAGS) \
-       $(IMLIB2_CFLAGS) \
        -DLOCALEDIR=\"$(localedir)\" \
        -DDATADIR=\"$(datadir)\" \
        -DCONFIGDIR=\"$(configdir)\" \
@@ -170,7 +174,6 @@ openbox_openbox_LDADD = \
        $(XML_LIBS) \
        $(EFENCE_LIBS) \
        $(LIBINTL) \
-       $(IMLIB2_LIBS) \
        obrender/libobrender.la \
        obt/libobt.la
 openbox_openbox_LDFLAGS = -export-dynamic
@@ -429,15 +432,16 @@ rrpubinclude_HEADERS = \
        obrender/version.h
 
 obtpubinclude_HEADERS = \
+       obt/link.h \
        obt/display.h \
        obt/keyboard.h \
-       obt/mainloop.h \
        obt/xml.h \
        obt/paths.h \
        obt/prop.h \
        obt/util.h \
        obt/version.h \
-       obt/xevent.h
+       obt/watch.h \
+       obt/xqueue.h
 
 nodist_pkgconfig_DATA = \
        obrender/obrender-3.5.pc \