change how stuff is linked, this should make libtool and automake work nicely again...

[mikachu/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8612a20..ad1c0fc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,11 +8,13 @@ desktopfilesdir = $(datadir)/gnome/wm-properties
 pkgconfigdir    = $(libdir)/pkgconfig
 pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
+xsddir          = $(datadir)/openbox
 userscriptdir   = $(datadir)/openbox
 
 theme = TheBear
 
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = subdir-objects foreign
+
 ACLOCAL_AMFLAGS = -I m4
 
 INCLUDES = -I.
@@ -21,13 +23,13 @@ noinst_PROGRAMS = \
        render/rendertest
 
 lib_LTLIBRARIES = \
-       render/libobrender.la \
-       parser/libobparser.la
+       parser/libobparser.la \
+       render/libobrender.la
 
 bin_PROGRAMS = \
        openbox/openbox \
        tools/kdetrayproxy/kdetrayproxy \
-       tools/gnomepanelproxy/gnomepanelproxy
+       tools/gnome-panel-control/gnome-panel-control
 
 ## render ##
 
@@ -35,7 +37,12 @@ render_rendertest_CPPFLAGS = \
        $(XFT_CFLAGS) \
        $(GLIB_CFLAGS) \
        -DG_LOG_DOMAIN=\"RenderTest\"
-render_rendertest_LDADD = render/libobrender.la
+render_rendertest_LDADD = \
+       parser/libobparser.la \
+       render/libobrender.la \
+       $(XFT_LIBS) \
+       $(GLIB_LIBS) \
+       $(XML_LIBS)
 render_rendertest_SOURCES = render/test.c
 
 render_libobrender_la_CPPFLAGS = \
@@ -46,10 +53,7 @@ render_libobrender_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LIBADD = \
-       $(X_LIBS) \
-       $(XFT_LIBS) \
-       $(GLIB_LIBS) \
-       parser/libobparser.la
+       $(X_LIBS)
 render_libobrender_la_LDFLAGS = \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 render_libobrender_la_SOURCES = \
@@ -82,9 +86,6 @@ parser_libobparser_la_CPPFLAGS = \
        -DLOCALEDIR=\"$(localedir)\" \
        -DDATADIR=\"$(datadir)\" \
        -DCONFIGDIR=\"$(configdir)\"
-parser_libobparser_la_LIBADD = \
-       $(GLIB_LIBS) \
-       $(XML_LIBS)
 parser_libobparser_la_LDFLAGS = \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 parser_libobparser_la_SOURCES = \
@@ -106,6 +107,7 @@ openbox_openbox_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
        $(SM_LIBS) \
+       $(XFT_LIBS) \
        $(XINERAMA_LIBS) \
        $(XKB_LIBS) \
        $(XRANDR_LIBS) \
@@ -202,14 +204,14 @@ tools_kdetrayproxy_kdetrayproxy_SOURCES = \
        tools/kdetrayproxy/kdetrayproxy.c
 
 
-## gnomepanelproxy ##
+## gnome-panel-control ##
 
-tools_gnomepanelproxy_gnomepanelproxy_CPPFLAGS = \
+tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \
        $(X_CFLAGS)
-tools_gnomepanelproxy_gnomepanelproxy_LDADD = \
+tools_gnome_panel_control_gnome_panel_control_LDADD = \
        $(X_LIBS)
-tools_gnomepanelproxy_gnomepanelproxy_SOURCES = \
-       tools/gnomepanelproxy/gnomepanelproxy.c
+tools_gnome_panel_control_gnome_panel_control_SOURCES = \
+       tools/gnome-panel-control/gnome-panel-control.c
 
 
 ## themes ##
@@ -269,20 +271,42 @@ nodist_pkgconfig_DATA = \
 dist_pixmap_DATA = \
        data/openbox.png
 
-dist_rc_DATA = \
+nodist_rc_DATA = \
        data/rc.xml \
        data/menu.xml
 
+dist_xsd_DATA = \
+       data/rc.xsd \
+       data/menu.xsd
+
+edit = $(SED) \
+       -e 's!@version\@!$(VERSION)!' \
+       -e 's!@xsddir\@!$(xsddir)!'
+
+data/rc.xml: Makefile $(srcdir)/data/rc.xml.in data
+       @echo make: creating $@
+       @rm -f $@
+       @mkdir data 2>/dev/null || true
+       @$(edit) $(srcdir)/data/rc.xml.in >$@
+
+data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data
+       @echo make: creating $@
+       @rm -f $@
+       @mkdir data 2>/dev/null || true
+       @$(edit) $(srcdir)/data/menu.xml.in >$@
+
 dist_userscript_DATA = \
        tools/themeupdate/themeupdate.py
 
 install-data-hook:
-       chmod +x $(userscriptdir)/themeupdate.py
+       chmod +x $(DESTDIR)$(userscriptdir)/themeupdate.py
 
 dist_desktopfiles_DATA = \
        data/openbox.desktop
 
 dist_noinst_DATA = \
+       data/rc.xml.in \
+       data/menu.xml.in \
        render/obrender-3.0.pc.in \
        parser/obparser-3.0.pc.in
 
@@ -293,6 +317,10 @@ EXTRA_DIST = \
        COPYING \
        AUTHORS
 
+CLEANFILES = \
+       data/rc.xml \
+       data/menu.xml
+
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc