change how stuff is linked, this should make libtool and automake work nicely again I think
This commit is contained in:
parent
54ccb6a542
commit
136b113278
3 changed files with 10 additions and 10 deletions
16
Makefile.am
16
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) \
|
||||
|
|
|
@ -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@
|
||||
|
|
|
@ -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@
|
||||
|
|
Loading…
Reference in a new issue