X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=9e8316f8212560ac87862ee77103eb69c942031e;hb=5960d27b1c35c58d3c1731c71c44b9c61328a34d;hp=dd6d68354a65251f12af08635c9f9a45ca48eda2;hpb=f8eae5e26cf2f84a9d6c20e0100bcbf761d54b34;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index dd6d6835..9e8316f8 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 \
@@ -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,15 +110,39 @@ 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) \
+	$(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/mainloop.h \
+	obt/mainloop.c \
+	obt/util.h
+
+## openbox ##
+
+openbox_openbox_CPPFLAGS = \
+	$(SM_CFLAGS) \
 	$(X_CFLAGS) \
 	$(XCURSOR_CFLAGS) \
 	$(SM_CFLAGS) \
@@ -131,11 +156,6 @@ openbox_openbox_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
 	$(SM_LIBS) \
-	$(XINERAMA_LIBS) \
-	$(XKB_LIBS) \
-	$(XRANDR_LIBS) \
-	$(XSHAPE_LIBS) \
-	$(XSYNC_LIBS) \
 	$(GLIB_LIBS) \
 	$(X_LIBS) \
 	$(XCURSOR_LIBS) \
@@ -144,7 +164,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 \
@@ -204,8 +225,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 +246,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 +260,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 \
@@ -264,10 +281,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 +393,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 +463,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 \
@@ -502,7 +521,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 \