X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=edd02fd1841c736f619e732bd8d93821da3ceb70;hb=d3d96b572a9278cf8f3542b56e583b1744b1110f;hp=d5e60b6d7c079d121a302ad2df4d216fede4c051;hpb=78b8bd01c277e7c7578256ea38b572140dd42fb5;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index d5e60b6d..edd02fd1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,6 @@ obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
 rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/obrender
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
-secretbindir    = $(libdir)/openbox
 appsdir         = $(datadir)/applications
 
 theme = Clearlooks
@@ -36,14 +35,25 @@ bin_PROGRAMS = \
 	tools/gnome-panel-control/gnome-panel-control \
 	tools/obxprop/obxprop
 
-dist_secretbin_SCRIPTS = \
-	tools/xdg-autostart/xdg-autostart
-
 nodist_bin_SCRIPTS = \
 	data/xsession/openbox-session \
 	data/xsession/openbox-gnome-session \
 	data/xsession/openbox-kde-session
 
+dist_rc_SCRIPTS = \
+	data/environment
+
+nodist_rc_SCRIPTS = \
+	data/autostart/autostart
+
+dist_libexec_SCRIPTS = \
+	data/autostart/openbox-xdg-autostart \
+	data/autostart/openbox-autostart
+
+nodist_libexec_SCRIPTS = \
+	data/autostart/openbox-autostart
+
+
 ## obrender ##
 
 obrender_rendertest_CPPFLAGS = \
@@ -64,6 +74,7 @@ obrender_libobrender_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(XML_CFLAGS) \
 	$(PANGO_CFLAGS) \
+	$(IMLIB2_CFLAGS) \
 	-DG_LOG_DOMAIN=\"ObRender\" \
 	-DDEFAULT_THEME=\"$(theme)\"
 obrender_libobrender_la_LDFLAGS = \
@@ -72,6 +83,7 @@ obrender_libobrender_la_LIBADD = \
 	$(X_LIBS) \
 	$(PANGO_LIBS) \
 	$(GLIB_LIBS) \
+	$(IMLIB2_LIBS) \
 	$(XML_LIBS)
 obrender_libobrender_la_SOURCES = \
 	gettext.h \
@@ -121,22 +133,27 @@ 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 \
+	obt/ddparse.c \
+	obt/link.h \
+	obt/link.c \
 	obt/paths.h \
 	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 ##
 
@@ -149,7 +166,6 @@ openbox_openbox_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(LIBSN_CFLAGS) \
 	$(XML_CFLAGS) \
-	$(IMLIB2_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DCONFIGDIR=\"$(configdir)\" \
@@ -163,7 +179,6 @@ openbox_openbox_LDADD = \
 	$(XML_LIBS) \
 	$(EFENCE_LIBS) \
 	$(LIBINTL) \
-	$(IMLIB2_LIBS) \
 	obrender/libobrender.la \
 	obt/libobt.la
 openbox_openbox_LDFLAGS = -export-dynamic
@@ -178,6 +193,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 \
@@ -334,7 +350,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
 
@@ -422,15 +438,16 @@ rrpubinclude_HEADERS = \
 	obrender/version.h
 
 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 \
@@ -444,9 +461,6 @@ dist_apps_DATA = \
 dist_pixmap_DATA = \
 	data/openbox.png
 
-nodist_rc_DATA = \
-	data/autostart.sh
-
 dist_rc_DATA = \
 	data/rc.xml \
 	data/menu.xml
@@ -454,12 +468,20 @@ dist_rc_DATA = \
 edit = $(SED) \
 	-e 's!@version\@!$(VERSION)!' \
 	-e 's!@configdir\@!$(configdir)!' \
-	-e 's!@secretbindir\@!$(secretbindir)!' \
+	-e 's!@libexecdir\@!$(libexecdir)!' \
 	-e 's!@bindir\@!$(bindir)!'
 
-data/autostart.sh: $(srcdir)/data/autostart.sh.in Makefile
+data/autostart/autostart: $(srcdir)/data/autostart/autostart.in Makefile
 	@echo make: creating $@
-	@$(edit) $< >$@
+	@test -d $(shell dirname $(builddir)/$@) || \
+	  mkdir $(shell dirname $(builddir)/$@)
+	@$(edit) $< >$(builddir)/$@
+
+data/autostart/openbox-autostart: $(srcdir)/data/autostart/openbox-autostart.in Makefile
+	@echo make: creating $@
+	@test -d $(shell dirname $(builddir)/$@) || \
+	  mkdir $(shell dirname $(builddir)/$@)
+	@$(edit) $< >$(builddir)/$@
 
 %.desktop: %.desktop.in Makefile
 	@echo make: creating $@
@@ -486,9 +508,10 @@ nodist_xsessions_DATA = \
 	data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
-	data/autostart.sh.in \
 	data/rc.xsd \
 	data/menu.xsd \
+	data/autostart/autostart.in \
+	data/autostart/openbox-autostart.in \
 	data/xsession/openbox.desktop.in \
 	data/xsession/openbox-gnome.desktop.in \
 	data/xsession/openbox-kde.desktop.in \
@@ -550,16 +573,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