Merge branch 'm4/master'

[mikachu/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 67d6e8b..c62a594 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
-libexecdir      = $(prefix)/libexec
 appsdir         = $(datadir)/applications
 
 theme = Clearlooks
@@ -42,11 +41,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
 
 
@@ -70,6 +73,7 @@ obrender_libobrender_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(XML_CFLAGS) \
        $(PANGO_CFLAGS) \
+       $(IMLIB2_CFLAGS) \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
 obrender_libobrender_la_LDFLAGS = \
@@ -78,9 +82,12 @@ obrender_libobrender_la_LIBADD = \
        $(X_LIBS) \
        $(PANGO_LIBS) \
        $(GLIB_LIBS) \
+       $(IMLIB2_LIBS) \
        $(XML_LIBS)
 obrender_libobrender_la_SOURCES = \
        gettext.h \
+       obrender/button.h \
+       obrender/button.c \
        obrender/color.h \
        obrender/color.c \
        obrender/font.h \
@@ -127,24 +134,27 @@ 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/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 \
        obt/prop.c \
+       obt/signal.h \
+       obt/signal.c \
        obt/util.h \
-       obt/xevent.h \
-       obt/xevent.c
+       obt/xqueue.h \
+       obt/xqueue.c
 
 ## openbox ##
 
@@ -157,12 +167,13 @@ openbox_openbox_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(LIBSN_CFLAGS) \
        $(XML_CFLAGS) \
-       $(IMLIB2_CFLAGS) \
        -DLOCALEDIR=\"$(localedir)\" \
        -DDATADIR=\"$(datadir)\" \
        -DCONFIGDIR=\"$(configdir)\" \
        -DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
+       $(XINERAMA_LIBS) \
+       $(XRANDR_LIBS) \
        $(SM_LIBS) \
        $(GLIB_LIBS) \
        $(X_LIBS) \
@@ -171,7 +182,6 @@ openbox_openbox_LDADD = \
        $(XML_LIBS) \
        $(EFENCE_LIBS) \
        $(LIBINTL) \
-       $(IMLIB2_LIBS) \
        obrender/libobrender.la \
        obt/libobt.la
 openbox_openbox_LDFLAGS = -export-dynamic
@@ -186,6 +196,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 \
@@ -314,9 +325,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 = \
@@ -342,7 +355,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
 
@@ -430,15 +443,16 @@ 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/xqueue.h
 
 nodist_pkgconfig_DATA = \
        obrender/obrender-3.5.pc \
@@ -459,12 +473,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/openbox-autostart: $(srcdir)/data/autostart/openbox-autostart.in Makefile
+data/autostart/autostart: $(top_srcdir)/data/autostart/autostart.in Makefile
+       @echo make: creating $@
+       @test -d $(shell dirname $(top_builddir)/$@) || \
+         mkdir $(shell dirname $(top_builddir)/$@)
+       @$(edit) $< >$(top_builddir)/$@
+
+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 $@
@@ -493,6 +516,8 @@ nodist_xsessions_DATA = \
 dist_noinst_DATA = \
        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 \
@@ -554,16 +579,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