add keyboard.[ch] to libobt. these are for tracking modifier keys, and translating...
[dana/openbox.git] / Makefile.am
index de04563..770f587 100644 (file)
@@ -25,7 +25,8 @@ check_PROGRAMS = \
 
 lib_LTLIBRARIES = \
        parser/libobparser.la \
-       render/libobrender.la
+       render/libobrender.la \
+       obt/libobt.la
 
 bin_PROGRAMS = \
        openbox/openbox \
@@ -62,7 +63,7 @@ render_libobrender_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LDFLAGS = \
-       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+       -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
 render_libobrender_la_LIBADD = \
        parser/libobparser.la \
        $(X_LIBS) \
@@ -101,7 +102,7 @@ parser_libobparser_la_CPPFLAGS = \
        -DDATADIR=\"$(datadir)\" \
        -DCONFIGDIR=\"$(configdir)\"
 parser_libobparser_la_LDFLAGS = \
-       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+       -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
 parser_libobparser_la_LIBADD = \
        $(GLIB_LIBS) \
        $(XML_LIBS) 
@@ -109,18 +110,44 @@ parser_libobparser_la_SOURCES = \
        parser/parse.h \
        parser/parse.c
 
-## openbox ##
+## obt ##
 
-openbox_openbox_CPPFLAGS = \
-       $(SM_CFLAGS) \
+obt_libobt_la_CPPFLAGS = \
        $(XINERAMA_CFLAGS) \
        $(XKB_CFLAGS) \
        $(XRANDR_CFLAGS) \
        $(XSHAPE_CFLAGS) \
        $(XSYNC_CFLAGS) \
-       $(XRENDER_CFLAGS) \
-       $(XDAMAGE_CFLAGS) \
-       $(XCOMPOSITE_CFLAGS) \
+       $(GLIB_CFLAGS) \
+       -DG_LOG_DOMAIN=\"Obt\" \
+       -DLOCALEDIR=\"$(localedir)\" \
+       -DDATADIR=\"$(datadir)\" \
+       -DCONFIGDIR=\"$(configdir)\"
+obt_libobt_la_LDFLAGS = \
+       -version-info $(OBT_CURRENT):$(OBT_REVISION):$(OBT_AGE)
+obt_libobt_la_LIBADD = \
+       $(XINERAMA_LIBS) \
+       $(XKB_LIBS) \
+       $(XRANDR_LIBS) \
+       $(XSHAPE_LIBS) \
+       $(XSYNC_LIBS) \
+       $(GLIB_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/prop.h \
+       obt/prop.c \
+       obt/util.h
+
+## openbox ##
+
+openbox_openbox_CPPFLAGS = \
+       $(SM_CFLAGS) \
        $(X_CFLAGS) \
        $(XCURSOR_CFLAGS) \
        $(SM_CFLAGS) \
@@ -134,15 +161,7 @@ openbox_openbox_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
        $(SM_LIBS) \
-       $(XINERAMA_LIBS) \
-       $(XKB_LIBS) \
-       $(XRANDR_LIBS) \
-       $(XSHAPE_LIBS) \
-       $(XSYNC_LIBS) \
        $(GLIB_LIBS) \
-       $(XRENDER_LIBS) \
-       $(XDAMAGE_LIBS) \
-       $(XCOMPOSITE_LIBS) \
        $(X_LIBS) \
        $(XCURSOR_LIBS) \
        $(LIBSN_LIBS) \
@@ -150,35 +169,44 @@ 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/directionalcyclewindows.c \
-       openbox/actions/directionaltargetwindow.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/maximizehorizontal.c \
-       openbox/actions/maximizevertical.c \
        openbox/actions/move.c \
        openbox/actions/moverelative.c \
-       openbox/actions/moveto.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 \
@@ -194,8 +222,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 \
@@ -204,8 +230,6 @@ openbox_openbox_SOURCES = \
        openbox/dock.h \
        openbox/event.c \
        openbox/event.h \
-       openbox/extensions.c \
-       openbox/extensions.h \
        openbox/focus.c \
        openbox/focus.h \
        openbox/focus_cycle.c \
@@ -227,8 +251,6 @@ openbox_openbox_SOURCES = \
        openbox/keyboard.h \
        openbox/keytree.c \
        openbox/keytree.h \
-       openbox/mainloop.c \
-       openbox/mainloop.h \
        openbox/menuframe.c \
        openbox/menuframe.h \
        openbox/menu.c \
@@ -243,14 +265,12 @@ 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 \
@@ -264,10 +284,7 @@ openbox_openbox_SOURCES = \
        openbox/translate.c \
        openbox/translate.h \
        openbox/window.c \
-       openbox/window.h \
-       openbox/xerror.c \
-       openbox/xerror.h
-
+       openbox/window.h
 
 ## gnome-panel-control ##
 
@@ -379,14 +396,18 @@ pubinclude_HEADERS = \
        render/mask.h \
        render/render.h \
        render/theme.h \
-       parser/parse.h
+       parser/parse.h \
+       obt/display.h \
+       obt/mainloop.h \
+       obt/util.h
 
 nodist_pubinclude_HEADERS = \
        version.h
 
 nodist_pkgconfig_DATA = \
-       render/obrender-3.0.pc \
-       parser/obparser-3.0.pc
+       render/obrender-4.0.pc \
+       parser/obparser-4.0.pc \
+       obt/obt-4.0.pc
 
 ## data ##
 
@@ -445,8 +466,9 @@ dist_noinst_DATA = \
        doc/openbox-gnome-session.1.in \
        doc/openbox-kde-session.1.sgml \
        doc/openbox-kde-session.1.in \
-       render/obrender-3.0.pc.in \
-       parser/obparser-3.0.pc.in \
+       render/obrender-4.0.pc.in \
+       parser/obparser-4.0.pc.in \
+       obt/obt-4.0.pc.in \
        tools/themeupdate/themeupdate.py \
        tests/hideshow.py \
        tests/Makefile \
@@ -482,17 +504,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
@@ -512,7 +524,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 \