X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=4384054ab251e22b82b9c12ffa3b5244ff07748c;hb=a93b00a5e93281c7c2c31112f0b6b827d605a19d;hp=9a9f9d3f0c19de400c73b495f852da801253002f;hpb=ca28e08c2f47dec4e30f54c3ef64376a6246fbf9;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 9a9f9d3f..4384054a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,9 +8,12 @@ rcdir           = $(configdir)/openbox
 xsessionsdir    = $(datadir)/xsessions
 gnomewmfilesdir = $(datadir)/gnome/wm-properties
 pkgconfigdir    = $(libdir)/pkgconfig
-pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
+obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
+rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
+secretbindir    = $(libdir)/openbox
+appsdir         = $(datadir)/applications
 
 theme = Clearlooks
 
@@ -24,12 +27,17 @@ check_PROGRAMS = \
 	render/rendertest
 
 lib_LTLIBRARIES = \
-	parser/libobparser.la \
+	obt/libobt.la \
 	render/libobrender.la
 
 bin_PROGRAMS = \
 	openbox/openbox \
-	tools/gnome-panel-control/gnome-panel-control
+	tools/gdm-control/gdm-control \
+	tools/gnome-panel-control/gnome-panel-control \
+	tools/obprop/obprop
+
+dist_secretbin_SCRIPTS = \
+	tools/xdg-autostart/xdg-autostart
 
 nodist_bin_SCRIPTS = \
 	data/xsession/openbox-session \
@@ -40,15 +48,13 @@ nodist_bin_SCRIPTS = \
 
 render_rendertest_CPPFLAGS = \
 	$(PANGO_CFLAGS) \
-	$(XFT_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\"RenderTest\"
 render_rendertest_LDADD = \
-	parser/libobparser.la \
+	obt/libobt.la \
 	render/libobrender.la \
 	$(GLIB_LIBS) \
 	$(PANGO_LIBS) \
-	$(XFT_LIBS) \
 	$(XML_LIBS) \
 	$(X_LIBS)
 render_rendertest_SOURCES = render/test.c
@@ -58,16 +64,14 @@ render_libobrender_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(XML_CFLAGS) \
 	$(PANGO_CFLAGS) \
-	$(XFT_CFLAGS) \
 	-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) \
 	$(GLIB_LIBS) \
 	$(XML_LIBS)
 render_libobrender_la_SOURCES = \
@@ -82,6 +86,8 @@ render_libobrender_la_SOURCES = \
 	render/icon.h \
 	render/image.h \
 	render/image.c \
+	render/imagecache.h \
+	render/imagecache.c \
 	render/instance.h \
 	render/instance.c \
 	render/mask.h \
@@ -91,36 +97,52 @@ 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/paths.h \
+	obt/paths.c \
+	obt/prop.h \
+	obt/prop.c \
+	obt/util.h \
+	obt/xevent.h \
+	obt/xevent.c
 
 ## openbox ##
 
 openbox_openbox_CPPFLAGS = \
 	$(SM_CFLAGS) \
-	$(XINERAMA_CFLAGS) \
-	$(XKB_CFLAGS) \
-	$(XRANDR_CFLAGS) \
-	$(XSHAPE_CFLAGS) \
-	$(XSYNC_CFLAGS) \
-	$(XRENDER_CFLAGS) \
-	$(XDAMAGE_CFLAGS) \
-	$(XCOMPOSITE_CFLAGS) \
 	$(X_CFLAGS) \
 	$(XCURSOR_CFLAGS) \
 	$(SM_CFLAGS) \
@@ -134,15 +156,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,7 +164,7 @@ 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 \
@@ -164,23 +178,23 @@ openbox_openbox_SOURCES = \
 	openbox/actions/decorations.c \
 	openbox/actions/desktop.c \
 	openbox/actions/dockautohide.c \
-	openbox/actions/directionalcyclewindows.c \
-	openbox/actions/directionaldesktop.c \
-	openbox/actions/directionaltargetwindow.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/menu.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 \
@@ -189,7 +203,9 @@ openbox_openbox_SOURCES = \
 	openbox/actions/resizerelative.c \
 	openbox/actions/restart.c \
 	openbox/actions/shade.c \
+	openbox/actions/shadelowerraise.c \
 	openbox/actions/showdesktop.c \
+	openbox/actions/showmenu.c \
 	openbox/actions/unfocus.c \
 	openbox/actions.c \
 	openbox/actions.h \
@@ -201,8 +217,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 \
@@ -211,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 \
@@ -234,15 +246,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 \
@@ -250,14 +258,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/prompt.c \
+	openbox/prompt.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 \
@@ -271,10 +279,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 ##
 
@@ -285,6 +290,28 @@ tools_gnome_panel_control_gnome_panel_control_LDADD = \
 tools_gnome_panel_control_gnome_panel_control_SOURCES = \
 	tools/gnome-panel-control/gnome-panel-control.c
 
+## obprop ##
+
+tools_obprop_obprop_CPPFLAGS = \
+	$(GLIB_CFLAGS) \
+	$(X_CFLAGS)
+tools_obprop_obprop_LDADD = \
+	$(GLIB_LIBS) \
+	$(X_LIBS)
+tools_obprop_obprop_SOURCES = \
+	tools/obprop/obprop.c
+
+## gdm-control ##
+
+tools_gdm_control_gdm_control_CPPFLAGS = \
+	$(X_CFLAGS) \
+	$(GLIB_CFLAGS)
+tools_gdm_control_gdm_control_LDADD = \
+	$(X_LIBS) \
+	$(GLIB_LIBS)
+tools_gdm_control_gdm_control_SOURCES = \
+	tools/gdm-control/gdm-control.c
+
 
 ## default button masks ##
 dist_docxbm_DATA = \
@@ -305,6 +332,10 @@ clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
 dist_clearlooks_theme_DATA= \
 	themes/Clearlooks/openbox-3/themerc
 
+clearlooks34_themedir = $(themedir)/Clearlooks/openbox-3
+dist_clearlooks34_theme_DATA= \
+	themes/Clearlooks-3.4/openbox-3/themerc
+
 clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
 dist_clearlooksolive_theme_DATA= \
 	themes/Clearlooks-Olive/openbox-3/themerc
@@ -376,7 +407,7 @@ dist_syscrash_theme_DATA= \
 
 ## public headers ##
 
-pubinclude_HEADERS = \
+rrpubinclude_HEADERS = \
 	render/color.h \
 	render/font.h \
 	render/geom.h \
@@ -386,30 +417,48 @@ pubinclude_HEADERS = \
 	render/mask.h \
 	render/render.h \
 	render/theme.h \
-	parser/parse.h
-
-nodist_pubinclude_HEADERS = \
-	version.h
+	render/version.h
+
+obtpubinclude_HEADERS = \
+	obt/display.h \
+	obt/keyboard.h \
+	obt/mainloop.h \
+	obt/parse.h \
+	obt/paths.h \
+	obt/prop.h \
+	obt/util.h \
+	obt/version.h \
+	obt/xevent.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 ##
 
+dist_apps_DATA = \
+	data/openbox.desktop
+
 dist_pixmap_DATA = \
 	data/openbox.png
 
+nodist_rc_DATA = \
+	data/autostart.sh
+
 dist_rc_DATA = \
-	data/autostart.sh \
 	data/rc.xml \
 	data/menu.xml
 
 edit = $(SED) \
 	-e 's!@version\@!$(VERSION)!' \
 	-e 's!@configdir\@!$(configdir)!' \
+	-e 's!@secretbindir\@!$(secretbindir)!' \
 	-e 's!@bindir\@!$(bindir)!'
 
+data/autostart.sh: $(srcdir)/data/autostart.sh.in Makefile
+	@echo make: creating $@
+	@$(edit) $< >$@
+
 %.desktop: %.desktop.in Makefile
 	@echo make: creating $@
 	@$(edit) $< >$@	
@@ -435,7 +484,7 @@ nodist_xsessions_DATA = \
 	data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
-	version.h.in \
+	data/autostart.sh.in \
 	data/rc.xsd \
 	data/menu.xsd \
 	data/xsession/openbox.desktop.in \
@@ -452,8 +501,10 @@ 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/version.h.in \
+	render/obrender-4.0.pc.in \
+	obt/obt-4.0.pc.in \
+	obt/version.h.in \
 	tools/themeupdate/themeupdate.py \
 	tests/hideshow.py \
 	tests/Makefile \
@@ -489,17 +540,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
@@ -519,7 +560,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 \