On Wed, Jun 30, 2010 at 10:53:33PM -0700, Alan Coopersmith wrote: > We only need Xfixes headers for the XserverRegion definition, don't > need to link against it directly or require clients link against it, > so only use CFLAGS from it in the Makefile, and only list it in > Requires.private in the .pc file. > > Don't need libXext at all - no headers or functions from it are used. > > Also clean up some extra appearances of *_CFLAGS & *_LIBS that aren't needed. > > Signed-off-by: Alan Coopersmith <[email protected]> > --- > configure.ac | 5 ++--- > src/Makefile.am | 4 ++-- > xcomposite.pc.in | 6 +++--- > 3 files changed, 7 insertions(+), 8 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 3f44a9d..e63ef8f 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -65,9 +65,8 @@ if test "$VERSION" = "" ; then > fi > COMPOSITEEXT_VERSION=[`echo $VERSION | sed > 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] > AC_SUBST(COMPOSITEEXT_VERSION) > -PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11 > xfixes xext fixesproto) > -AC_SUBST(XCOMPOSITE_CFLAGS) > -AC_SUBST(XCOMPOSITE_LIBS) > +PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11) > +PKG_CHECK_MODULES(XFIXES, xfixes) > > AC_OUTPUT([Makefile > src/Makefile > diff --git a/src/Makefile.am b/src/Makefile.am > index e7b9db8..456bb88 100644 > --- a/src/Makefile.am > +++ b/src/Makefile.am > @@ -19,7 +19,7 @@ > # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR > # PERFORMANCE OF THIS SOFTWARE. > > -AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) > +AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS) > AM_CPPFLAGS = -I$(top_srcdir)/include > > lib_LTLIBRARIES = libXcomposite.la > @@ -28,7 +28,7 @@ libXcomposite_la_SOURCES = \ > xcompositeint.h \ > Xcomposite.c > > -libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS) $(X_LIBS) $(XCOMPOSITE_LIBS) > +libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS) > > libXcomposite_la_LDFLAGS = -version-number 1:0:0 -no-undefined > > diff --git a/xcomposite.pc.in b/xcomposite.pc.in > index 18c2a12..bed1f29 100644 > --- a/xcomposite.pc.in > +++ b/xcomposite.pc.in > @@ -4,9 +4,9 @@ libd...@libdir@ > included...@includedir@ > > Name: Xcomposite > -Description: X Composite Library > +Description: X Composite Extension Library > Version: @PACKAGE_VERSION@ > -Requires: xproto compositeproto >= @COMPOSITEEXT_VERSION@ xfixes > -Requires.private: x11 xfixes xext > +Requires: xproto compositeproto >= @COMPOSITEEXT_VERSION@ > +Requires.private: x11 xfixes > Cflags: -I${includedir} > Libs: -L${libdir} -lXcomposite > -- > 1.5.6.5 >
Acked-by: Peter Hutterer <[email protected]> Cheers, Peter _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
