add BSEARCH() macros in obt/bsearch.h that to a binary search on an array, use it...

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 164724676d3f3ba3dfbb4513cb257e8846008bc4..e8d5b462039221f0fe03e4d354468ef045c09716 100644 (file)
--- 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 = \
@@ -69,7 +74,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) \
@@ -122,6 +126,7 @@ obt_libobt_la_LIBADD = \
        $(GLIB_LIBS) \
        $(XML_LIBS)
 obt_libobt_la_SOURCES = \
+       obt/bsearch.h \
        obt/display.h \
        obt/display.c \
        obt/internal.h \
@@ -131,6 +136,10 @@ obt_libobt_la_SOURCES = \
        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 \
@@ -244,8 +253,6 @@ openbox_openbox_SOURCES = \
        openbox/grab.h \
        openbox/group.c \
        openbox/group.h \
-       openbox/imageload.c \
-       openbox/imageload.h \
        openbox/keyboard.c \
        openbox/keyboard.h \
        openbox/keytree.c \
@@ -425,6 +432,7 @@ rrpubinclude_HEADERS = \
        obrender/version.h
 
 obtpubinclude_HEADERS = \
+       obt/link.h \
        obt/display.h \
        obt/keyboard.h \
        obt/mainloop.h \
@@ -447,9 +455,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
@@ -457,10 +462,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) $< >$@
 
@@ -489,9 +498,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 \
@@ -544,7 +554,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