We shouldn't enforce incr when the app resizes itself. But it's so confusing.

[mikachu/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b5e132d..828008e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,14 +26,15 @@ check_PROGRAMS = \
        render/rendertest
 
 lib_LTLIBRARIES = \
-       render/libobrender.la \
-       obt/libobt.la
+       obt/libobt.la \
+       render/libobrender.la
 
 bin_PROGRAMS = \
        openbox/openbox \
+       tools/gdm-control/gdm-control \
        tools/gnome-panel-control/gnome-panel-control
 
-secretbin_SCRIPTS = \
+dist_secretbin_SCRIPTS = \
        tools/xdg-autostart/xdg-autostart
 
 nodist_bin_SCRIPTS = \
@@ -45,7 +46,6 @@ nodist_bin_SCRIPTS = \
 
 render_rendertest_CPPFLAGS = \
        $(PANGO_CFLAGS) \
-       $(XFT_CFLAGS) \
        $(GLIB_CFLAGS) \
        -DG_LOG_DOMAIN=\"RenderTest\"
 render_rendertest_LDADD = \
@@ -53,7 +53,6 @@ render_rendertest_LDADD = \
        render/libobrender.la \
        $(GLIB_LIBS) \
        $(PANGO_LIBS) \
-       $(XFT_LIBS) \
        $(XML_LIBS) \
        $(X_LIBS)
 render_rendertest_SOURCES = render/test.c
@@ -63,7 +62,6 @@ render_libobrender_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(XML_CFLAGS) \
        $(PANGO_CFLAGS) \
-       $(XFT_CFLAGS) \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LDFLAGS = \
@@ -72,11 +70,12 @@ render_libobrender_la_LIBADD = \
        obt/libobt.la \
        $(X_LIBS) \
        $(PANGO_LIBS) \
-       $(XFT_LIBS) \
        $(GLIB_LIBS) \
        $(XML_LIBS)
 render_libobrender_la_SOURCES = \
        gettext.h \
+       render/button.h \
+       render/button.c \
        render/color.h \
        render/color.c \
        render/font.h \
@@ -151,6 +150,7 @@ openbox_openbox_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(LIBSN_CFLAGS) \
        $(XML_CFLAGS) \
+       $(IMLIB2_CFLAGS) \
        -DLOCALEDIR=\"$(localedir)\" \
        -DDATADIR=\"$(datadir)\" \
        -DCONFIGDIR=\"$(configdir)\" \
@@ -164,6 +164,7 @@ openbox_openbox_LDADD = \
        $(XML_LIBS) \
        $(EFENCE_LIBS) \
        $(LIBINTL) \
+       $(IMLIB2_LIBS) \
        render/libobrender.la \
        obt/libobt.la
 openbox_openbox_LDFLAGS = -export-dynamic
@@ -184,6 +185,7 @@ openbox_openbox_SOURCES = \
        openbox/actions/execute.c \
        openbox/actions/exit.c \
        openbox/actions/focus.c \
+       openbox/actions/focusfallback.c \
        openbox/actions/focustobottom.c \
        openbox/actions/fullscreen.c \
        openbox/actions/growtoedge.c \
@@ -192,6 +194,7 @@ openbox_openbox_SOURCES = \
        openbox/actions/kill.c \
        openbox/actions/layer.c \
        openbox/actions/lock.c \
+       openbox/actions/session.c \
        openbox/actions/lower.c \
        openbox/actions/maximize.c \
        openbox/actions/move.c \
@@ -210,6 +213,7 @@ openbox_openbox_SOURCES = \
        openbox/actions/shade.c \
        openbox/actions/showdesktop.c \
        openbox/actions/showmenu.c \
+       openbox/actions/stop.c \
        openbox/actions/unfocus.c \
        openbox/actions.c \
        openbox/actions.h \
@@ -227,6 +231,8 @@ openbox_openbox_SOURCES = \
        openbox/debug.h \
        openbox/dock.c \
        openbox/dock.h \
+       openbox/edges.c \
+       openbox/edges.h \
        openbox/event.c \
        openbox/event.h \
        openbox/focus.c \
@@ -246,6 +252,9 @@ openbox_openbox_SOURCES = \
        openbox/grab.h \
        openbox/group.c \
        openbox/group.h \
+       openbox/hooks.c \
+       openbox/hooks.h \
+       openbox/imageload.h \
        openbox/keyboard.c \
        openbox/keyboard.h \
        openbox/keytree.c \
@@ -285,6 +294,10 @@ openbox_openbox_SOURCES = \
        openbox/window.c \
        openbox/window.h
 
+if USE_IMLIB2
+    openbox_openbox_SOURCES += openbox/imageload.c
+endif
+
 ## gnome-panel-control ##
 
 tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \
@@ -294,6 +307,17 @@ tools_gnome_panel_control_gnome_panel_control_LDADD = \
 tools_gnome_panel_control_gnome_panel_control_SOURCES = \
        tools/gnome-panel-control/gnome-panel-control.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 = \
@@ -421,8 +445,10 @@ nodist_pkgconfig_DATA = \
 dist_pixmap_DATA = \
        data/openbox.png
 
+nodist_rc_DATA = \
+       data/autostart.sh
+
 dist_rc_DATA = \
-       data/autostart.sh \
        data/rc.xml \
        data/menu.xml
 
@@ -461,6 +487,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 \