Merge branch 'backport' into work

[mikachu/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dd5bb6c..4384054 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,8 @@ obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
 rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
+secretbindir    = $(libdir)/openbox
+appsdir         = $(datadir)/applications
 
 theme = Clearlooks
 
@@ -25,14 +27,16 @@ check_PROGRAMS = \
        render/rendertest
 
 lib_LTLIBRARIES = \
-       render/libobrender.la \
-       obt/libobt.la
+       obt/libobt.la \
+       render/libobrender.la
 
 bin_PROGRAMS = \
        openbox/openbox \
-       tools/gnome-panel-control/gnome-panel-control
+       tools/gdm-control/gdm-control \
+       tools/gnome-panel-control/gnome-panel-control \
+       tools/obprop/obprop
 
-bin_SCRIPTS = \
+dist_secretbin_SCRIPTS = \
        tools/xdg-autostart/xdg-autostart
 
 nodist_bin_SCRIPTS = \
@@ -44,7 +48,6 @@ nodist_bin_SCRIPTS = \
 
 render_rendertest_CPPFLAGS = \
        $(PANGO_CFLAGS) \
-       $(XFT_CFLAGS) \
        $(GLIB_CFLAGS) \
        -DG_LOG_DOMAIN=\"RenderTest\"
 render_rendertest_LDADD = \
@@ -52,7 +55,6 @@ render_rendertest_LDADD = \
        render/libobrender.la \
        $(GLIB_LIBS) \
        $(PANGO_LIBS) \
-       $(XFT_LIBS) \
        $(XML_LIBS) \
        $(X_LIBS)
 render_rendertest_SOURCES = render/test.c
@@ -62,7 +64,6 @@ render_libobrender_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(XML_CFLAGS) \
        $(PANGO_CFLAGS) \
-       $(XFT_CFLAGS) \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LDFLAGS = \
@@ -71,7 +72,6 @@ render_libobrender_la_LIBADD = \
        obt/libobt.la \
        $(X_LIBS) \
        $(PANGO_LIBS) \
-       $(XFT_LIBS) \
        $(GLIB_LIBS) \
        $(XML_LIBS)
 render_libobrender_la_SOURCES = \
@@ -203,6 +203,7 @@ openbox_openbox_SOURCES = \
        openbox/actions/resizerelative.c \
        openbox/actions/restart.c \
        openbox/actions/shade.c \
+       openbox/actions/shadelowerraise.c \
        openbox/actions/showdesktop.c \
        openbox/actions/showmenu.c \
        openbox/actions/unfocus.c \
@@ -289,6 +290,28 @@ tools_gnome_panel_control_gnome_panel_control_LDADD = \
 tools_gnome_panel_control_gnome_panel_control_SOURCES = \
        tools/gnome-panel-control/gnome-panel-control.c
 
+## obprop ##
+
+tools_obprop_obprop_CPPFLAGS = \
+       $(GLIB_CFLAGS) \
+       $(X_CFLAGS)
+tools_obprop_obprop_LDADD = \
+       $(GLIB_LIBS) \
+       $(X_LIBS)
+tools_obprop_obprop_SOURCES = \
+       tools/obprop/obprop.c
+
+## gdm-control ##
+
+tools_gdm_control_gdm_control_CPPFLAGS = \
+       $(X_CFLAGS) \
+       $(GLIB_CFLAGS)
+tools_gdm_control_gdm_control_LDADD = \
+       $(X_LIBS) \
+       $(GLIB_LIBS)
+tools_gdm_control_gdm_control_SOURCES = \
+       tools/gdm-control/gdm-control.c
+
 
 ## default button masks ##
 dist_docxbm_DATA = \
@@ -413,19 +436,29 @@ nodist_pkgconfig_DATA = \
 
 ## data ##
 
+dist_apps_DATA = \
+       data/openbox.desktop
+
 dist_pixmap_DATA = \
        data/openbox.png
 
+nodist_rc_DATA = \
+       data/autostart.sh
+
 dist_rc_DATA = \
-       data/autostart.sh \
        data/rc.xml \
        data/menu.xml
 
 edit = $(SED) \
        -e 's!@version\@!$(VERSION)!' \
        -e 's!@configdir\@!$(configdir)!' \
+       -e 's!@secretbindir\@!$(secretbindir)!' \
        -e 's!@bindir\@!$(bindir)!'
 
+data/autostart.sh: $(srcdir)/data/autostart.sh.in Makefile
+       @echo make: creating $@
+       @$(edit) $< >$@
+
 %.desktop: %.desktop.in Makefile
        @echo make: creating $@
        @$(edit) $< >$@ 
@@ -451,6 +484,7 @@ nodist_xsessions_DATA = \
        data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
+       data/autostart.sh.in \
        data/rc.xsd \
        data/menu.xsd \
        data/xsession/openbox.desktop.in \