diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-09-25 21:58:10 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-09-25 21:58:10 +0000 |
| commit | 136b113278f84283f1f9c8dbfd3e42a46ec61740 (patch) | |
| tree | c27827c90fc79baeb094f7be08b0d01910c4df94 | |
| parent | 54ccb6a5428fbf33bf1a97d0f60f6623f0195fa3 (diff) | |
change how stuff is linked, this should make libtool and automake work nicely again I think
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | parser/obparser-3.0.pc.in | 2 | ||||
| -rw-r--r-- | render/obrender-3.0.pc.in | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index ef0f66c2..ad1c0fcd 100644 --- a/Makefile.am +++ b/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 @@ 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 = \ @@ -84,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 = \ @@ -108,6 +107,7 @@ openbox_openbox_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Openbox\" openbox_openbox_LDADD = \ $(SM_LIBS) \ + $(XFT_LIBS) \ $(XINERAMA_LIBS) \ $(XKB_LIBS) \ $(XRANDR_LIBS) \ diff --git a/parser/obparser-3.0.pc.in b/parser/obparser-3.0.pc.in index 88d99f18..75d04c99 100644 --- a/parser/obparser-3.0.pc.in +++ b/parser/obparser-3.0.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ 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@ diff --git a/render/obrender-3.0.pc.in b/render/obrender-3.0.pc.in index ab908ac1..a28d9ebc 100644 --- a/render/obrender-3.0.pc.in +++ b/render/obrender-3.0.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ 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@ |