X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=4d12d4cef2267da14963d0538124e5eff08da28a;hb=ebce321a72331697287838b864735e7b81e60b33;hp=c6c5dfb399a0f80fbbf117337f1ad8e1fae3d641;hpb=c6f2875d61ce038bcc3b28e28aa26a0648efd752;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index c6c5dfb3..4d12d4ce 100644
--- 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,24 @@ 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.c
+
 ## openbox ##
 
 openbox_openbox_CPPFLAGS = \
@@ -144,7 +163,8 @@ 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 \
@@ -162,6 +182,7 @@ openbox_openbox_SOURCES = \
 	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 \
@@ -170,7 +191,6 @@ openbox_openbox_SOURCES = \
 	openbox/actions/layer.c \
 	openbox/actions/lower.c \
 	openbox/actions/maximize.c \
-	openbox/actions/menu.c \
 	openbox/actions/move.c \
 	openbox/actions/moverelative.c \
 	openbox/actions/moveresizeto.c \
@@ -184,6 +204,7 @@ openbox_openbox_SOURCES = \
 	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 \
@@ -242,14 +263,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 \
@@ -378,14 +399,16 @@ pubinclude_HEADERS = \
 	render/mask.h \
 	render/render.h \
 	render/theme.h \
-	parser/parse.h
+	parser/parse.h \
+	obt/obt.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 ##
 
@@ -446,6 +469,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 \
@@ -481,8 +505,7 @@ nodist_man_MANS = \
 	doc/openbox-kde-session.1
 
 EXTRA_DIST = \
-	config.rpath \
-	mkinstalldirs
+	config.rpath
 
 # make clean doesn't delete these for some reason, even though they are
 # built by make
@@ -502,7 +525,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 \