change how stuff is linked, this should make libtool and automake work nicely again I think
Dana Jansens danakj@orodu.net
3 files changed,
10 insertions(+),
10 deletions(-)
M
Makefile.am
→
Makefile.am
@@ -37,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 = \@@ -48,10 +53,7 @@ $(XML_CFLAGS) \
-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 = \@@ -84,9 +86,6 @@ -DG_LOG_DOMAIN=\"ObParser\" \
-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 = \@@ -108,6 +107,7 @@ -DCONFIGDIR=\"$(configdir)\" \
-DG_LOG_DOMAIN=\"Openbox\" openbox_openbox_LDADD = \ $(SM_LIBS) \ + $(XFT_LIBS) \ $(XINERAMA_LIBS) \ $(XKB_LIBS) \ $(XRANDR_LIBS) \
M
parser/obparser-3.0.pc.in
→
parser/obparser-3.0.pc.in
@@ -6,6 +6,6 @@
Name: ObParser Description: Openbox config file parsing library Version: @VERSION@ -Requires: libxml-2.0 +Requires: libxml-2.0 glib-2.0 Libs: -L${libdir} -lobparser Cflags: -I${includedir}/openbox/@OB_VERSION@
M
render/obrender-3.0.pc.in
→
render/obrender-3.0.pc.in
@@ -6,6 +6,6 @@
Name: ObRender Description: Openbox Render Library Version: @VERSION@ -Requires: obparser-3.0 +Requires: obparser-3.0 glib-2.0 xft Libs: -L${libdir} -lobrender Cflags: -I${includedir}/openbox/@OB_VERSION@