Fix a copypasto that broke interactive keybinds with meta and hyper keys

[dana/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 91b2303..62570bd 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 = \
@@ -64,15 +69,16 @@ obrender_libobrender_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(XML_CFLAGS) \
        $(PANGO_CFLAGS) \
+       $(IMLIB2_CFLAGS) \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
 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) \
+       $(IMLIB2_LIBS) \
        $(XML_LIBS)
 obrender_libobrender_la_SOURCES = \
        gettext.h \
@@ -122,22 +128,29 @@ 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/watch.h \
+       obt/watch.c \
+       obt/xqueue.h \
+       obt/xqueue.c
 
 ## openbox ##
 
@@ -150,7 +163,6 @@ openbox_openbox_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(LIBSN_CFLAGS) \
        $(XML_CFLAGS) \
-       $(IMLIB2_CFLAGS) \
        -DLOCALEDIR=\"$(localedir)\" \
        -DDATADIR=\"$(datadir)\" \
        -DCONFIGDIR=\"$(configdir)\" \
@@ -164,7 +176,6 @@ openbox_openbox_LDADD = \
        $(XML_LIBS) \
        $(EFENCE_LIBS) \
        $(LIBINTL) \
-       $(IMLIB2_LIBS) \
        obrender/libobrender.la \
        obt/libobt.la
 openbox_openbox_LDFLAGS = -export-dynamic
@@ -179,6 +190,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 \
@@ -423,15 +435,17 @@ 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/watch.h \
+       obt/xqueue.h
 
 nodist_pkgconfig_DATA = \
        obrender/obrender-3.5.pc \
@@ -445,9 +459,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 +466,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) $< >$@
 
@@ -487,9 +502,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 \
@@ -542,7 +558,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