X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=d919f65b49e4d74883ab9c177c1488f4ac4df560;hb=3121146eccd031a56d410eb48f3002558f41b40a;hp=4c1f89d458d11be6d8bb29fd994e9ad4fb6f9e99;hpb=4d286146806d92df2ebbb4541609bdd1f6d7fcc5;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 4c1f89d4..d919f65b 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,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 = \
@@ -130,8 +135,10 @@ obt_libobt_la_SOURCES = \
 	obt/mainloop.c \
 	obt/xml.h \
 	obt/xml.c \
-	obt/ddfile.h \
-	obt/ddfile.c \
+	obt/ddparse.h \
+	obt/ddparse.c \
+	obt/link.h \
+	obt/link.c \
 	obt/paths.h \
 	obt/paths.c \
 	obt/prop.h \
@@ -424,6 +431,7 @@ rrpubinclude_HEADERS = \
 	obrender/version.h
 
 obtpubinclude_HEADERS = \
+	obt/link.h \
 	obt/display.h \
 	obt/keyboard.h \
 	obt/mainloop.h \
@@ -446,9 +454,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
@@ -456,10 +461,14 @@ 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) $< >$@
+
+data/autostart/openbox-autostart: $(srcdir)/data/autostart/openbox-autostart.in Makefile
 	@echo make: creating $@
 	@$(edit) $< >$@
 
@@ -488,9 +497,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 \