summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-06-22 22:46:39 +0000
committerSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-06-22 22:46:39 +0000
commit63d3d3060793b834a6f55a1788ed74dd91ff1635 (patch)
treec88b8427f4606a3740734542f786fd02ed7a8d0e
parent414f10d9cd304ad410eaab1faeb9bec6db99a254 (diff)
downloadxorg-lib-libdmx-63d3d3060793b834a6f55a1788ed74dd91ff1635.tar.gz
Apply these patches from Theo van Klaveren:
lib-dmx.patch lib-FS.patch lib-X11.patch lib-XRes.patch lib-XScrnSaver.patch lib-xtrans.patch to make the libraries distcheck.
-rw-r--r--ChangeLog7
-rw-r--r--man/Makefile.am2
-rw-r--r--src/Makefile.am5
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f21b648..b873983 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-22 Theo van Klaveren <t.vanklaveren@student.utwente.nl>
+
+ Fix make distcheck.
+
+ * man/Makefile.am: Fix typo (man3_MANS -> man_MANS).
+ * src/Makefile.am: Fix and add automake flags.
+
2005-06-21 Alexander Gottwald <ago at freedesktop dot org>
* configure.ac
diff --git a/man/Makefile.am b/man/Makefile.am
index f36c81b..d697660 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -37,5 +37,5 @@ man_MANS = \
DMXRemoveInput.3 \
DMXRemoveScreen.3 \
DMXSync.3
-EXTRA_DIST = $(man3_MANS)
+EXTRA_DIST = $(man_MANS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 74c0652..ac6014b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,10 +3,9 @@ lib_LTLIBRARIES = libdmx.la
libdmx_la_SOURCES = \
dmx.c
-libdmx_la_LIBADD = @DEP_LIBS@
+libdmx_la_LIBADD = $(DEP_LIBS)
libdmx_la_LDFLAGS = -version-info 7:0:0 -no-undefined
-
-
+libdmx_la_CFLAGS = $(DEP_CFLAGS)