summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2010-06-30 22:49:26 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2010-07-07 10:53:03 -0700
commit219e4de3666e3a7dda42c64ab1539a4cc5adbee4 (patch)
tree1b191634d97516f91ad0f706068ac00e4df76c3e /src
parent01c4691e18b536de6585a0e93e05e2831cf2be34 (diff)
downloadxorg-lib-libXcomposite-219e4de3666e3a7dda42c64ab1539a4cc5adbee4.tar.gz
Remove unneeded dependencies from configure.ac & xcomposite.pc
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 <alan.coopersmith@oracle.com> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am4
1 files changed, 2 insertions, 2 deletions
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