Merge branch 'backport' into work

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 76f84542e9ce07a328d4a8e4c05f6f0e8429890c..dd5bb6c542f8dbe315eebb253114b9d8bcbc4647 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,8 @@ rcdir           = $(configdir)/openbox
 xsessionsdir    = $(datadir)/xsessions
 gnomewmfilesdir = $(datadir)/gnome/wm-properties
 pkgconfigdir    = $(libdir)/pkgconfig
-pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
+obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
+rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
 
@@ -24,7 +25,6 @@ check_PROGRAMS = \
        render/rendertest
 
 lib_LTLIBRARIES = \
-       parser/libobparser.la \
        render/libobrender.la \
        obt/libobt.la
 
@@ -32,6 +32,9 @@ bin_PROGRAMS = \
        openbox/openbox \
        tools/gnome-panel-control/gnome-panel-control
 
+bin_SCRIPTS = \
+       tools/xdg-autostart/xdg-autostart
+
 nodist_bin_SCRIPTS = \
        data/xsession/openbox-session \
        data/xsession/openbox-gnome-session \
@@ -45,7 +48,7 @@ render_rendertest_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        -DG_LOG_DOMAIN=\"RenderTest\"
 render_rendertest_LDADD = \
-       parser/libobparser.la \
+       obt/libobt.la \
        render/libobrender.la \
        $(GLIB_LIBS) \
        $(PANGO_LIBS) \
@@ -65,7 +68,7 @@ render_libobrender_la_CPPFLAGS = \
 render_libobrender_la_LDFLAGS = \
        -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
 render_libobrender_la_LIBADD = \
-       parser/libobparser.la \
+       obt/libobt.la \
        $(X_LIBS) \
        $(PANGO_LIBS) \
        $(XFT_LIBS) \
@@ -83,6 +86,8 @@ render_libobrender_la_SOURCES = \
        render/icon.h \
        render/image.h \
        render/image.c \
+       render/imagecache.h \
+       render/imagecache.c \
        render/instance.h \
        render/instance.c \
        render/mask.h \
@@ -92,24 +97,6 @@ render_libobrender_la_SOURCES = \
        render/theme.h \
        render/theme.c
 
-## parser ##
-
-parser_libobparser_la_CPPFLAGS = \
-       $(GLIB_CFLAGS) \
-       $(XML_CFLAGS) \
-       -DG_LOG_DOMAIN=\"ObParser\" \
-       -DLOCALEDIR=\"$(localedir)\" \
-       -DDATADIR=\"$(datadir)\" \
-       -DCONFIGDIR=\"$(configdir)\"
-parser_libobparser_la_LDFLAGS = \
-       -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
-parser_libobparser_la_LIBADD = \
-       $(GLIB_LIBS) \
-       $(XML_LIBS) 
-parser_libobparser_la_SOURCES = \
-       parser/parse.h \
-       parser/parse.c
-
 ## obt ##
 
 obt_libobt_la_CPPFLAGS = \
@@ -119,6 +106,7 @@ obt_libobt_la_CPPFLAGS = \
        $(XSHAPE_CFLAGS) \
        $(XSYNC_CFLAGS) \
        $(GLIB_CFLAGS) \
+       $(XML_CFLAGS) \
        -DG_LOG_DOMAIN=\"Obt\" \
        -DLOCALEDIR=\"$(localedir)\" \
        -DDATADIR=\"$(datadir)\" \
@@ -131,15 +119,25 @@ obt_libobt_la_LIBADD = \
        $(XRANDR_LIBS) \
        $(XSHAPE_LIBS) \
        $(XSYNC_LIBS) \
-       $(GLIB_LIBS)
+       $(GLIB_LIBS) \
+       $(XML_LIBS)
 obt_libobt_la_SOURCES = \
        obt/display.h \
        obt/display.c \
+       obt/internal.h \
+       obt/keyboard.h \
+       obt/keyboard.c \
        obt/mainloop.h \
        obt/mainloop.c \
+       obt/parse.h \
+       obt/parse.c \
+       obt/paths.h \
+       obt/paths.c \
        obt/prop.h \
        obt/prop.c \
-       obt/util.h
+       obt/util.h \
+       obt/xevent.h \
+       obt/xevent.c
 
 ## openbox ##
 
@@ -166,7 +164,6 @@ openbox_openbox_LDADD = \
        $(EFENCE_LIBS) \
        $(LIBINTL) \
        render/libobrender.la \
-       parser/libobparser.la \
        obt/libobt.la
 openbox_openbox_LDFLAGS = -export-dynamic
 openbox_openbox_SOURCES = \
@@ -253,8 +250,6 @@ openbox_openbox_SOURCES = \
        openbox/menu.c \
        openbox/menu.h \
        openbox/misc.h \
-       openbox/modkeys.c \
-       openbox/modkeys.h \
        openbox/mouse.c \
        openbox/mouse.h \
        openbox/moveresize.c \
@@ -266,10 +261,10 @@ openbox_openbox_SOURCES = \
        openbox/ping.h \
        openbox/place.c \
        openbox/place.h \
+       openbox/prompt.c \
+       openbox/prompt.h \
        openbox/popup.c \
        openbox/popup.h \
-       openbox/prop.c \
-       openbox/prop.h \
        openbox/resist.c \
        openbox/resist.h \
        openbox/screen.c \
@@ -314,6 +309,10 @@ clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
 dist_clearlooks_theme_DATA= \
        themes/Clearlooks/openbox-3/themerc
 
+clearlooks34_themedir = $(themedir)/Clearlooks/openbox-3
+dist_clearlooks34_theme_DATA= \
+       themes/Clearlooks-3.4/openbox-3/themerc
+
 clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
 dist_clearlooksolive_theme_DATA= \
        themes/Clearlooks-Olive/openbox-3/themerc
@@ -385,7 +384,7 @@ dist_syscrash_theme_DATA= \
 
 ## public headers ##
 
-pubinclude_HEADERS = \
+rrpubinclude_HEADERS = \
        render/color.h \
        render/font.h \
        render/geom.h \
@@ -395,17 +394,21 @@ pubinclude_HEADERS = \
        render/mask.h \
        render/render.h \
        render/theme.h \
-       parser/parse.h \
+       render/version.h
+
+obtpubinclude_HEADERS = \
        obt/display.h \
+       obt/keyboard.h \
        obt/mainloop.h \
-       obt/util.h
-
-nodist_pubinclude_HEADERS = \
-       version.h
+       obt/parse.h \
+       obt/paths.h \
+       obt/prop.h \
+       obt/util.h \
+       obt/version.h \
+       obt/xevent.h
 
 nodist_pkgconfig_DATA = \
        render/obrender-4.0.pc \
-       parser/obparser-4.0.pc \
        obt/obt-4.0.pc
 
 ## data ##
@@ -448,7 +451,6 @@ nodist_xsessions_DATA = \
        data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
-       version.h.in \
        data/rc.xsd \
        data/menu.xsd \
        data/xsession/openbox.desktop.in \
@@ -465,9 +467,10 @@ dist_noinst_DATA = \
        doc/openbox-gnome-session.1.in \
        doc/openbox-kde-session.1.sgml \
        doc/openbox-kde-session.1.in \
+       render/version.h.in \
        render/obrender-4.0.pc.in \
-       parser/obparser-4.0.pc.in \
        obt/obt-4.0.pc.in \
+       obt/version.h.in \
        tools/themeupdate/themeupdate.py \
        tests/hideshow.py \
        tests/Makefile \