Change default doubleclick timeout to 500ms and keep track of where last click was

[dana/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 62570bd..7146908 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@ localedir       = $(datadir)/locale
 configdir       = $(sysconfdir)/xdg
 rcdir           = $(configdir)/openbox
 xsessionsdir    = $(datadir)/xsessions
+gnomesessiondir = $(datadir)/gnome-session/sessions
 gnomewmfilesdir = $(datadir)/gnome/wm-properties
 pkgconfigdir    = $(libdir)/pkgconfig
 obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
@@ -41,11 +42,15 @@ nodist_bin_SCRIPTS = \
        data/xsession/openbox-kde-session
 
 dist_rc_SCRIPTS = \
-       data/environment \
+       data/environment
+
+nodist_rc_SCRIPTS = \
        data/autostart/autostart
 
 dist_libexec_SCRIPTS = \
-       data/autostart/openbox-xdg-autostart \
+       data/autostart/openbox-xdg-autostart
+
+nodist_libexec_SCRIPTS = \
        data/autostart/openbox-autostart
 
 
@@ -82,6 +87,8 @@ obrender_libobrender_la_LIBADD = \
        $(XML_LIBS)
 obrender_libobrender_la_SOURCES = \
        gettext.h \
+       obrender/button.h \
+       obrender/button.c \
        obrender/color.h \
        obrender/color.c \
        obrender/font.h \
@@ -147,8 +154,6 @@ obt_libobt_la_SOURCES = \
        obt/signal.h \
        obt/signal.c \
        obt/util.h \
-       obt/watch.h \
-       obt/watch.c \
        obt/xqueue.h \
        obt/xqueue.c
 
@@ -168,6 +173,8 @@ openbox_openbox_CPPFLAGS = \
        -DCONFIGDIR=\"$(configdir)\" \
        -DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
+       $(XINERAMA_LIBS) \
+       $(XRANDR_LIBS) \
        $(SM_LIBS) \
        $(GLIB_LIBS) \
        $(X_LIBS) \
@@ -319,9 +326,11 @@ tools_obxprop_obxprop_SOURCES = \
 ## gdm-control ##
 
 tools_gdm_control_gdm_control_CPPFLAGS = \
+       $(XAUTH_CFLAGS) \
        $(X_CFLAGS) \
        $(GLIB_CFLAGS)
 tools_gdm_control_gdm_control_LDADD = \
+       $(XAUTH_LIBS) \
        $(X_LIBS) \
        $(GLIB_LIBS)
 tools_gdm_control_gdm_control_SOURCES = \
@@ -347,7 +356,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
 
@@ -444,7 +453,6 @@ obtpubinclude_HEADERS = \
        obt/signal.h \
        obt/util.h \
        obt/version.h \
-       obt/watch.h \
        obt/xqueue.h
 
 nodist_pkgconfig_DATA = \
@@ -466,16 +474,21 @@ dist_rc_DATA = \
 edit = $(SED) \
        -e 's!@version\@!$(VERSION)!' \
        -e 's!@configdir\@!$(configdir)!' \
+       -e 's!@rcdir\@!$(rcdir)!' \
        -e 's!@libexecdir\@!$(libexecdir)!' \
        -e 's!@bindir\@!$(bindir)!'
 
-data/autostart/autostart: $(srcdir)/data/autostart/autostart.in Makefile
+data/autostart/autostart: $(top_srcdir)/data/autostart/autostart.in Makefile
        @echo make: creating $@
-       @$(edit) $< >$@
+       @test -d $(shell dirname $(top_builddir)/$@) || \
+         mkdir $(shell dirname $(top_builddir)/$@)
+       @$(edit) $< >$(top_builddir)/$@
 
-data/autostart/openbox-autostart: $(srcdir)/data/autostart/openbox-autostart.in Makefile
+data/autostart/openbox-autostart: $(top_srcdir)/data/autostart/openbox-autostart.in Makefile
        @echo make: creating $@
-       @$(edit) $< >$@
+       @test -d $(shell dirname $(top_builddir)/$@) || \
+         mkdir $(shell dirname $(top_builddir)/$@)
+       @$(edit) $< >$(top_builddir)/$@
 
 %.desktop: %.desktop.in Makefile
        @echo make: creating $@
@@ -501,6 +514,9 @@ nodist_xsessions_DATA = \
        data/xsession/openbox-gnome.desktop \
        data/xsession/openbox-kde.desktop
 
+dist_gnomesession_DATA = \
+       data/xsession/openbox-gnome.session
+
 dist_noinst_DATA = \
        data/rc.xsd \
        data/menu.xsd \
@@ -567,16 +583,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