X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=f59d3e7e6942f3cc1630348dcdd214f60d1257c8;hb=cc4e44e8376f5b76cb23f8cd642f32e0e41b9150;hp=d919f65b49e4d74883ab9c177c1488f4ac4df560;hpb=0d90bd57abe304ffca4bf5cd1a647d30dea882b7;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index d919f65b..f59d3e7e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,11 +41,15 @@ nodist_bin_SCRIPTS = \
 	data/xsession/openbox-kde-session
 
 dist_rc_SCRIPTS = \
-	data/environment \
+	data/environment
+
+nodist_rc_SCRIPTS = \
 	data/autostart/autostart
 
 dist_libexec_SCRIPTS = \
-	data/autostart/openbox-xdg-autostart \
+	data/autostart/openbox-xdg-autostart
+
+nodist_libexec_SCRIPTS = \
 	data/autostart/openbox-autostart
 
 
@@ -69,6 +73,7 @@ obrender_libobrender_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(XML_CFLAGS) \
 	$(PANGO_CFLAGS) \
+	$(IMLIB2_CFLAGS) \
 	-DG_LOG_DOMAIN=\"ObRender\" \
 	-DDEFAULT_THEME=\"$(theme)\"
 obrender_libobrender_la_LDFLAGS = \
@@ -77,6 +82,7 @@ obrender_libobrender_la_LIBADD = \
 	$(X_LIBS) \
 	$(PANGO_LIBS) \
 	$(GLIB_LIBS) \
+	$(IMLIB2_LIBS) \
 	$(XML_LIBS)
 obrender_libobrender_la_SOURCES = \
 	gettext.h \
@@ -126,13 +132,12 @@ obt_libobt_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(XML_LIBS)
 obt_libobt_la_SOURCES = \
+	obt/bsearch.h \
 	obt/display.h \
 	obt/display.c \
 	obt/internal.h \
 	obt/keyboard.h \
 	obt/keyboard.c \
-	obt/mainloop.h \
-	obt/mainloop.c \
 	obt/xml.h \
 	obt/xml.c \
 	obt/ddparse.h \
@@ -143,9 +148,11 @@ obt_libobt_la_SOURCES = \
 	obt/paths.c \
 	obt/prop.h \
 	obt/prop.c \
+	obt/signal.h \
+	obt/signal.c \
 	obt/util.h \
-	obt/xevent.h \
-	obt/xevent.c
+	obt/xqueue.h \
+	obt/xqueue.c
 
 ## openbox ##
 
@@ -158,12 +165,13 @@ openbox_openbox_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(LIBSN_CFLAGS) \
 	$(XML_CFLAGS) \
-	$(IMLIB2_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DCONFIGDIR=\"$(configdir)\" \
 	-DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
+	$(XINERAMA_LIBS) \
+	$(XRANDR_LIBS) \
 	$(SM_LIBS) \
 	$(GLIB_LIBS) \
 	$(X_LIBS) \
@@ -172,7 +180,6 @@ openbox_openbox_LDADD = \
 	$(XML_LIBS) \
 	$(EFENCE_LIBS) \
 	$(LIBINTL) \
-	$(IMLIB2_LIBS) \
 	obrender/libobrender.la \
 	obt/libobt.la
 openbox_openbox_LDFLAGS = -export-dynamic
@@ -187,6 +194,7 @@ openbox_openbox_SOURCES = \
 	openbox/actions/debug.c \
 	openbox/actions/decorations.c \
 	openbox/actions/desktop.c \
+	openbox/actions/dock.c \
 	openbox/actions/dockautohide.c \
 	openbox/actions/directionalwindows.c \
 	openbox/actions/execute.c \
@@ -315,9 +323,11 @@ tools_obxprop_obxprop_SOURCES = \
 ## gdm-control ##
 
 tools_gdm_control_gdm_control_CPPFLAGS = \
+	$(XAUTH_CFLAGS) \
 	$(X_CFLAGS) \
 	$(GLIB_CFLAGS)
 tools_gdm_control_gdm_control_LDADD = \
+	$(XAUTH_LIBS) \
 	$(X_LIBS) \
 	$(GLIB_LIBS)
 tools_gdm_control_gdm_control_SOURCES = \
@@ -343,7 +353,7 @@ clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
 dist_clearlooks_theme_DATA= \
 	themes/Clearlooks/openbox-3/themerc
 
-clearlooks34_themedir = $(themedir)/Clearlooks/openbox-3
+clearlooks34_themedir = $(themedir)/Clearlooks-3.4/openbox-3
 dist_clearlooks34_theme_DATA= \
 	themes/Clearlooks-3.4/openbox-3/themerc
 
@@ -434,13 +444,13 @@ obtpubinclude_HEADERS = \
 	obt/link.h \
 	obt/display.h \
 	obt/keyboard.h \
-	obt/mainloop.h \
 	obt/xml.h \
 	obt/paths.h \
 	obt/prop.h \
+	obt/signal.h \
 	obt/util.h \
 	obt/version.h \
-	obt/xevent.h
+	obt/xqueue.h
 
 nodist_pkgconfig_DATA = \
 	obrender/obrender-3.5.pc \
@@ -461,16 +471,21 @@ dist_rc_DATA = \
 edit = $(SED) \
 	-e 's!@version\@!$(VERSION)!' \
 	-e 's!@configdir\@!$(configdir)!' \
+	-e 's!@rcdir\@!$(rcdir)!' \
 	-e 's!@libexecdir\@!$(libexecdir)!' \
 	-e 's!@bindir\@!$(bindir)!'
 
-data/autostart/autostart: $(srcdir)/data/autostart/autostart.in Makefile
+data/autostart/autostart: $(top_srcdir)/data/autostart/autostart.in Makefile
 	@echo make: creating $@
-	@$(edit) $< >$@
+	@test -d $(shell dirname $(top_builddir)/$@) || \
+	  mkdir $(shell dirname $(top_builddir)/$@)
+	@$(edit) $< >$(top_builddir)/$@
 
-data/autostart/openbox-autostart: $(srcdir)/data/autostart/openbox-autostart.in Makefile
+data/autostart/openbox-autostart: $(top_srcdir)/data/autostart/openbox-autostart.in Makefile
 	@echo make: creating $@
-	@$(edit) $< >$@
+	@test -d $(shell dirname $(top_builddir)/$@) || \
+	  mkdir $(shell dirname $(top_builddir)/$@)
+	@$(edit) $< >$(top_builddir)/$@
 
 %.desktop: %.desktop.in Makefile
 	@echo make: creating $@
@@ -562,16 +577,11 @@ EXTRA_DIST = \
 # 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
+	$(nodist_man_MANS) \
+	$(nodist_bin_SCRIPTS) \
+	$(nodist_xsessions_DATA) \
+	$(nodist_rc_SCRIPTS) \
+	$(nodist_libexec_SCRIPTS)
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc