X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=ed68b185f1292de65e8df0a13397d94f4830e1ac;hb=fdabb69f4f25596df972caa76c85c2aeba26226e;hp=515c6dc7da7c09352bf21ccffde4cda67fc88d57;hpb=eb09b1873d731a0e7290334a832a76cb233f34a7;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 515c6dc7..ed68b185 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,8 +24,8 @@ check_PROGRAMS = \
 	render/rendertest
 
 lib_LTLIBRARIES = \
-	parser/libobparser.la \
-	render/libobrender.la
+	render/libobrender.la \
+	obt/libobt.la
 
 bin_PROGRAMS = \
 	openbox/openbox \
@@ -36,9 +36,6 @@ nodist_bin_SCRIPTS = \
 	data/xsession/openbox-gnome-session \
 	data/xsession/openbox-kde-session
 
-noinst_PROGRAMS = \
-	tools/themetoxml/themetoxml
-
 ## render ##
 
 render_rendertest_CPPFLAGS = \
@@ -47,7 +44,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,9 +62,9 @@ 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 \
+	obt/libobt.la \
 	$(X_LIBS) \
 	$(PANGO_LIBS) \
 	$(XFT_LIBS) \
@@ -94,33 +91,48 @@ render_libobrender_la_SOURCES = \
 	render/theme.h \
 	render/theme.c
 
-## parser ##
+## obt ##
 
-parser_libobparser_la_CPPFLAGS = \
+obt_libobt_la_CPPFLAGS = \
+	$(XINERAMA_CFLAGS) \
+	$(XKB_CFLAGS) \
+	$(XRANDR_CFLAGS) \
+	$(XSHAPE_CFLAGS) \
+	$(XSYNC_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(XML_CFLAGS) \
-	-DG_LOG_DOMAIN=\"ObParser\" \
+	-DG_LOG_DOMAIN=\"Obt\" \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DCONFIGDIR=\"$(configdir)\"
-parser_libobparser_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-parser_libobparser_la_LIBADD = \
+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) \
-	$(XML_LIBS) 
-parser_libobparser_la_SOURCES = \
-	parser/parse.h \
-	parser/parse.c
+	$(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/prop.h \
+	obt/prop.c \
+	obt/util.h
 
 ## openbox ##
 
 openbox_openbox_CPPFLAGS = \
 	$(SM_CFLAGS) \
-	$(XINERAMA_CFLAGS) \
-	$(XKB_CFLAGS) \
-	$(XRANDR_CFLAGS) \
-	$(XSHAPE_CFLAGS) \
-	$(XSYNC_CFLAGS) \
 	$(X_CFLAGS) \
 	$(XCURSOR_CFLAGS) \
 	$(SM_CFLAGS) \
@@ -134,11 +146,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) \
@@ -147,12 +154,50 @@ openbox_openbox_LDADD = \
 	$(EFENCE_LIBS) \
 	$(LIBINTL) \
 	render/libobrender.la \
-	parser/libobparser.la
+	obt/libobt.la
 openbox_openbox_LDFLAGS = -export-dynamic
 openbox_openbox_SOURCES = \
 	gettext.h \
-	openbox/action.c \
-	openbox/action.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 \
 	openbox/client.h \
 	openbox/client_list_menu.c \
@@ -169,14 +214,14 @@ 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 \
 	openbox/focus_cycle.h \
 	openbox/focus_cycle_indicator.c \
 	openbox/focus_cycle_indicator.h \
+	openbox/focus_cycle_popup.c \
+	openbox/focus_cycle_popup.h \
 	openbox/frame.c \
 	openbox/frame.h \
 	openbox/framerender.c \
@@ -190,15 +235,11 @@ 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 \
 	openbox/menu.h \
 	openbox/misc.h \
-	openbox/modkeys.c \
-	openbox/modkeys.h \
 	openbox/mouse.c \
 	openbox/mouse.h \
 	openbox/moveresize.c \
@@ -206,14 +247,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 \
@@ -227,25 +266,7 @@ openbox_openbox_SOURCES = \
 	openbox/translate.c \
 	openbox/translate.h \
 	openbox/window.c \
-	openbox/window.h \
-	openbox/xerror.c \
-	openbox/xerror.h
-
-
-## themetoxml ##
-
-tools_themetoxml_themetoxml_CPPFLAGS = \
-	$(X_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(XML_CFLAGS)
-tools_themetoxml_themetoxml_LDADD = \
-	$(X_LIBS) \
-	$(GLIB_LIBS) \
-	$(XML_LIBS)
-tools_themetoxml_themetoxml_SOURCES = \
-	tools/themetoxml/themetoxml.c \
-	tools/themetoxml/rgb.h
-
+	openbox/window.h
 
 ## gnome-panel-control ##
 
@@ -274,11 +295,11 @@ dist_docxbm_DATA = \
 
 clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
 dist_clearlooks_theme_DATA= \
-	themes/Clearlooks/openbox-3/themerc.xml
+	themes/Clearlooks/openbox-3/themerc
 
 clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
 dist_clearlooksolive_theme_DATA= \
-	themes/Clearlooks-Olive/openbox-3/themerc.xml
+	themes/Clearlooks-Olive/openbox-3/themerc
 
 mikachu_themedir = $(themedir)/Mikachu/openbox-3
 dist_mikachu_theme_DATA= \
@@ -287,7 +308,7 @@ dist_mikachu_theme_DATA= \
 	themes/Mikachu/openbox-3/desk.xbm \
 	themes/Mikachu/openbox-3/iconify.xbm \
 	themes/Mikachu/openbox-3/max.xbm \
-	themes/Mikachu/openbox-3/themerc.xml
+	themes/Mikachu/openbox-3/themerc
 
 
 natura_themedir = $(themedir)/Natura/openbox-3
@@ -304,11 +325,11 @@ dist_natura_theme_DATA= \
 	themes/Natura/openbox-3/max.xbm \
 	themes/Natura/openbox-3/shade.xbm \
 	themes/Natura/openbox-3/shade_hover.xbm \
-	themes/Natura/openbox-3/themerc.xml
+	themes/Natura/openbox-3/themerc
 
 artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3
 dist_artwizboxed_theme_DATA= \
-	themes/Artwiz-boxed/openbox-3/themerc.xml
+	themes/Artwiz-boxed/openbox-3/themerc
 
 bear2_themedir = $(themedir)/Bear2/openbox-3
 dist_bear2_theme_DATA= \
@@ -323,11 +344,19 @@ dist_bear2_theme_DATA= \
 	themes/Bear2/openbox-3/max.xbm \
 	themes/Bear2/openbox-3/shade_pressed.xbm \
 	themes/Bear2/openbox-3/shade.xbm \
-	themes/Bear2/openbox-3/themerc.xml
+	themes/Bear2/openbox-3/themerc
 
 orang_themedir = $(themedir)/Orang/openbox-3
 dist_orang_theme_DATA= \
-	themes/Orang/openbox-3/themerc.xml
+	themes/Orang/openbox-3/themerc
+
+onyx_themedir = $(themedir)/Onyx/openbox-3
+dist_onyx_theme_DATA= \
+	themes/Onyx/openbox-3/themerc
+
+onyxcitrus_themedir = $(themedir)/Onyx-Citrus/openbox-3
+dist_onyxcitrus_theme_DATA= \
+	themes/Onyx-Citrus/openbox-3/themerc
 
 syscrash_themedir = $(themedir)/Syscrash/openbox-3
 dist_syscrash_theme_DATA= \
@@ -335,7 +364,7 @@ dist_syscrash_theme_DATA= \
 	themes/Syscrash/openbox-3/max_pressed.xbm \
 	themes/Syscrash/openbox-3/max_toggled.xbm \
 	themes/Syscrash/openbox-3/max.xbm \
-	themes/Syscrash/openbox-3/themerc.xml
+	themes/Syscrash/openbox-3/themerc
 
 ## public headers ##
 
@@ -349,14 +378,24 @@ pubinclude_HEADERS = \
 	render/mask.h \
 	render/render.h \
 	render/theme.h \
-	parser/parse.h
+	obt/display.h \
+	obt/display.c \
+	obt/keyboard.h \
+	obt/keyboard.c \
+	obt/mainloop.h \
+	obt/mainloop.c \
+	obt/parse.h \
+	obt/parse.c \
+	obt/prop.h \
+	obt/prop.c \
+	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 \
+	obt/obt-4.0.pc
 
 ## data ##
 
@@ -373,59 +412,20 @@ edit = $(SED) \
 	-e 's!@configdir\@!$(configdir)!' \
 	-e 's!@bindir\@!$(bindir)!'
 
-data/xsession/openbox-gnome.desktop: \
-		$(srcdir)/data/xsession/openbox-gnome.desktop.in
-	@echo make: creating $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $< >$@
-
-data/xsession/openbox-kde.desktop: \
-		$(srcdir)/data/xsession/openbox-kde.desktop.in
-	@echo make: creating $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $< >$@
-
-data/xsession/openbox.desktop: \
-		$(srcdir)/data/xsession/openbox.desktop.in
-	@echo make: creating $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $< >$@
-
-data/xsession/openbox-gnome-session: \
-		$(srcdir)/data/xsession/openbox-gnome-session.in
+%.desktop: %.desktop.in Makefile
 	@echo make: creating $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $< >$@
-	@chmod a+x $@
-
-data/xsession/openbox-kde-session: \
-		$(srcdir)/data/xsession/openbox-kde-session.in
-	@echo make: creating $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $< >$@
-	@chmod a+x $@
+	@$(edit) $< >$@	
 
-data/xsession/openbox-session: \
-		$(srcdir)/data/xsession/openbox-session.in
+%-session: %-session.in Makefile
 	@echo make: creating $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $< >$@
-	@chmod a+x $@
+	@$(edit) $< >$@	
 
 %.1.in: %.1.sgml
 	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
 	@docbook-to-man $< >$@
 
-%.1: %.1.in
+%.1: %.1.in Makefile
 	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
 	@$(edit) $< >$@	
 
 dist_gnomewmfiles_DATA = \
@@ -440,7 +440,6 @@ dist_noinst_DATA = \
 	version.h.in \
 	data/rc.xsd \
 	data/menu.xsd \
-	data/themerc.xsd \
 	data/xsession/openbox.desktop.in \
 	data/xsession/openbox-gnome.desktop.in \
 	data/xsession/openbox-kde.desktop.in \
@@ -455,8 +454,8 @@ 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 \
+	obt/obt-4.0.pc.in \
 	tools/themeupdate/themeupdate.py \
 	tests/hideshow.py \
 	tests/Makefile \
@@ -483,33 +482,36 @@ dist_doc_DATA = \
 	COPYING \
 	data/rc.xsd \
 	data/menu.xsd \
-	data/themerc.xsd \
 	doc/rc-mouse-focus.xml
 
-dist_man_MANS = \
+nodist_man_MANS = \
 	doc/openbox.1 \
 	doc/openbox-session.1 \
 	doc/openbox-gnome-session.1 \
 	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
+CLEANFILES = \
+	doc/openbox.1 \
+	doc/openbox-session.1 \
+	doc/openbox-gnome-session.1 \
+	doc/openbox-kde-session.1 \
+	data/xsession/openbox-session \
+	data/xsession/openbox-gnome-session \
+	data/xsession/openbox-kde-session \
+	data/xsession/openbox.desktop \
+	data/xsession/openbox-gnome.desktop \
+	data/xsession/openbox-kde.desktop
 
 #doc:
 #       $(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 \