X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=67d6e8b4d9dcea772c9d3c95a95f3db9f83ab661;hb=4418e6988b5ea80acf0dee4f27a43b27a1fdf48f;hp=91b2303397f7c72f8daf0e1fb087b7deca506e69;hpb=3bd4397b6ec5212bfe53a36892746962dc45dbeb;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 91b23033..67d6e8b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
 rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/obrender
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
-secretbindir    = $(libdir)/openbox
+libexecdir      = $(prefix)/libexec
 appsdir         = $(datadir)/applications
 
 theme = Clearlooks
@@ -36,14 +36,20 @@ 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 \
+	data/autostart/autostart
+
+dist_libexec_SCRIPTS = \
+	data/autostart/openbox-xdg-autostart \
+	data/autostart/openbox-autostart
+
+
 ## obrender ##
 
 obrender_rendertest_CPPFLAGS = \
@@ -69,7 +75,6 @@ obrender_libobrender_la_CPPFLAGS = \
 obrender_libobrender_la_LDFLAGS = \
 	-version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
 obrender_libobrender_la_LIBADD = \
-	obt/libobt.la \
 	$(X_LIBS) \
 	$(PANGO_LIBS) \
 	$(GLIB_LIBS) \
@@ -131,6 +136,8 @@ obt_libobt_la_SOURCES = \
 	obt/mainloop.c \
 	obt/xml.h \
 	obt/xml.c \
+	obt/ddfile.h \
+	obt/ddfile.c \
 	obt/paths.h \
 	obt/paths.c \
 	obt/prop.h \
@@ -445,9 +452,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
@@ -455,10 +459,10 @@ 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/openbox-autostart: $(srcdir)/data/autostart/openbox-autostart.in Makefile
 	@echo make: creating $@
 	@$(edit) $< >$@
 
@@ -487,7 +491,6 @@ nodist_xsessions_DATA = \
 	data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
-	data/autostart.sh.in \
 	data/rc.xsd \
 	data/menu.xsd \
 	data/xsession/openbox.desktop.in \
@@ -542,7 +545,8 @@ nodist_man_MANS = \
 	doc/openbox.1 \
 	doc/openbox-session.1 \
 	doc/openbox-gnome-session.1 \
-	doc/openbox-kde-session.1
+	doc/openbox-kde-session.1 \
+	doc/obxprop.1
 
 EXTRA_DIST = \
 	config.rpath