split the header up for obt

[dana/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0ebc9aa..528fc38 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,8 @@ check_PROGRAMS = \
 
 lib_LTLIBRARIES = \
        parser/libobparser.la \
-       render/libobrender.la
+       render/libobrender.la \
+       obt/libobt.la
 
 bin_PROGRAMS = \
        openbox/openbox \
@@ -109,6 +110,26 @@ parser_libobparser_la_SOURCES = \
        parser/parse.h \
        parser/parse.c
 
+## obt ##
+
+obt_libobt_la_CPPFLAGS = \
+       $(GLIB_CFLAGS) \
+       $(XML_CFLAGS) \
+       -DG_LOG_DOMAIN=\"Obt\" \
+       -DLOCALEDIR=\"$(localedir)\" \
+       -DDATADIR=\"$(datadir)\" \
+       -DCONFIGDIR=\"$(configdir)\"
+obt_libobt_la_LDFLAGS = \
+       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+obt_libobt_la_LIBADD = \
+       $(GLIB_LIBS) \
+       $(XML_LIBS)
+obt_libobt_la_SOURCES = \
+       obt/obt.h \
+       obt/instance.h \
+       obt/instance.c \
+       obt/util.h
+
 ## openbox ##
 
 openbox_openbox_CPPFLAGS = \
@@ -118,9 +139,6 @@ openbox_openbox_CPPFLAGS = \
        $(XRANDR_CFLAGS) \
        $(XSHAPE_CFLAGS) \
        $(XSYNC_CFLAGS) \
-       $(XRENDER_CFLAGS) \
-       $(XDAMAGE_CFLAGS) \
-       $(XCOMPOSITE_CFLAGS) \
        $(X_CFLAGS) \
        $(XCURSOR_CFLAGS) \
        $(SM_CFLAGS) \
@@ -140,9 +158,6 @@ openbox_openbox_LDADD = \
        $(XSHAPE_LIBS) \
        $(XSYNC_LIBS) \
        $(GLIB_LIBS) \
-       $(XRENDER_LIBS) \
-       $(XDAMAGE_LIBS) \
-       $(XCOMPOSITE_LIBS) \
        $(X_LIBS) \
        $(XCURSOR_LIBS) \
        $(LIBSN_LIBS) \
@@ -150,10 +165,49 @@ openbox_openbox_LDADD = \
        $(EFENCE_LIBS) \
        $(LIBINTL) \
        render/libobrender.la \
-       parser/libobparser.la
+       parser/libobparser.la \
+       obt/libobt.la
 openbox_openbox_LDFLAGS = -export-dynamic
 openbox_openbox_SOURCES = \
        gettext.h \
+       openbox/actions/all.c \
+       openbox/actions/all.h \
+       openbox/actions/addremovedesktop.c \
+       openbox/actions/breakchroot.c \
+       openbox/actions/close.c \
+       openbox/actions/cyclewindows.c \
+       openbox/actions/debug.c \
+       openbox/actions/decorations.c \
+       openbox/actions/desktop.c \
+       openbox/actions/dockautohide.c \
+       openbox/actions/directionalwindows.c \
+       openbox/actions/execute.c \
+       openbox/actions/exit.c \
+       openbox/actions/focus.c \
+       openbox/actions/focustobottom.c \
+       openbox/actions/fullscreen.c \
+       openbox/actions/growtoedge.c \
+       openbox/actions/iconify.c \
+       openbox/actions/if.c \
+       openbox/actions/kill.c \
+       openbox/actions/layer.c \
+       openbox/actions/lower.c \
+       openbox/actions/maximize.c \
+       openbox/actions/move.c \
+       openbox/actions/moverelative.c \
+       openbox/actions/moveresizeto.c \
+       openbox/actions/movetoedge.c \
+       openbox/actions/omnipresent.c \
+       openbox/actions/raise.c \
+       openbox/actions/raiselower.c \
+       openbox/actions/reconfigure.c \
+       openbox/actions/resize.c \
+       openbox/actions/resizerelative.c \
+       openbox/actions/restart.c \
+       openbox/actions/shade.c \
+       openbox/actions/showdesktop.c \
+       openbox/actions/showmenu.c \
+       openbox/actions/unfocus.c \
        openbox/actions.c \
        openbox/actions.h \
        openbox/client.c \
@@ -164,8 +218,6 @@ openbox_openbox_SOURCES = \
        openbox/client_list_combined_menu.h \
        openbox/client_menu.c \
        openbox/client_menu.h \
-       openbox/composite.c \
-       openbox/composite.h \
        openbox/config.c \
        openbox/config.h \
        openbox/debug.c \
@@ -213,14 +265,14 @@ openbox_openbox_SOURCES = \
        openbox/mwm.h \
        openbox/openbox.c \
        openbox/openbox.h \
+       openbox/ping.c \
+       openbox/ping.h \
        openbox/place.c \
        openbox/place.h \
        openbox/popup.c \
        openbox/popup.h \
        openbox/prop.c \
        openbox/prop.h \
-       openbox/propwin.c \
-       openbox/propwin.h \
        openbox/resist.c \
        openbox/resist.h \
        openbox/screen.c \
@@ -349,14 +401,18 @@ pubinclude_HEADERS = \
        render/mask.h \
        render/render.h \
        render/theme.h \
-       parser/parse.h
+       parser/parse.h \
+       obt/obt.h \
+       obt/instance.h \
+       obt/util.h
 
 nodist_pubinclude_HEADERS = \
        version.h
 
 nodist_pkgconfig_DATA = \
        render/obrender-3.0.pc \
-       parser/obparser-3.0.pc
+       parser/obparser-3.0.pc \
+       obt/obt-4.0.pc
 
 ## data ##
 
@@ -417,6 +473,7 @@ dist_noinst_DATA = \
        doc/openbox-kde-session.1.in \
        render/obrender-3.0.pc.in \
        parser/obparser-3.0.pc.in \
+       obt/obt-4.0.pc.in \
        tools/themeupdate/themeupdate.py \
        tests/hideshow.py \
        tests/Makefile \
@@ -452,17 +509,7 @@ nodist_man_MANS = \
        doc/openbox-kde-session.1
 
 EXTRA_DIST = \
-       debian/changelog.in \
-       debian/compat \
-       debian/conffiles \
-       debian/control \
-       debian/copyright \
-       debian/menu \
-       debian/postinst \
-       debian/postrm \
-       debian/rules \
-       config.rpath \
-       mkinstalldirs
+       config.rpath
 
 # make clean doesn't delete these for some reason, even though they are
 # built by make
@@ -482,7 +529,7 @@ CLEANFILES = \
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc
 
 distclean-local:
-       for d in . m4 po render; do \
+       for d in . m4 po render parser obt openbox; do \
                for p in core core.* gmon.out *\~ *.orig *.rej .\#*; do \
                        rm -f "$$d/$$p"; \
                done \