summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2005-07-12 03:16:02 +0000
committerKeith Packard <keithp@keithp.com>2005-07-12 03:16:02 +0000
commit71c592267f8305840a3c272576c3ef63a034d6e9 (patch)
tree1f4c6dfcb99e0369a41ee160f30d192190a56387
parentdb8d18cedb4a948ef0dc37703be4d795d39fef37 (diff)
downloadxorg-lib-libXcomposite-71c592267f8305840a3c272576c3ef63a034d6e9.tar.gz
Add missing files
-rw-r--r--ChangeLog6
-rw-r--r--src/.cvsignore6
-rw-r--r--src/Makefile.am47
3 files changed, 59 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b9d492a..aca88dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-07-11 Keith Packard <keithp@keithp.com>
+ * src/.cvsignore:
+ * src/Makefile.am:
+ Add missing files
+
+2005-07-11 Keith Packard <keithp@keithp.com>
+
* configure.ac:
* xcomposite.pc.in:
Require modular X library.
diff --git a/src/.cvsignore b/src/.cvsignore
new file mode 100644
index 0000000..799fc97
--- /dev/null
+++ b/src/.cvsignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+*.lo
+*.la
+Makefile
+Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..726a02f
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,47 @@
+#
+# $Id$
+#
+# Copyright © 2003 Keith Packard, Noah Levitt
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of Keith Packard not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission. Keith Packard makes no
+# representations about the suitability of this software for any purpose. It
+# is provided "as is" without express or implied warranty.
+#
+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+# CONSEQUENTIAL COMPOSITES OR ANY COMPOSITES WHATSOEVER RESULTING FROM LOSS OF USE,
+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
+
+lib_LTLIBRARIES = libXcomposite.la
+
+libXcomposite_la_SOURCES = \
+ xcompositeint.h \
+ Xcomposite.c
+
+libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS) $(X_LIBS)
+
+#
+# Library version info. Check the libtool docs for
+# instructions on when and how to change this value
+#
+# bump when the ABI changes
+XCOMPOSITE_CURRENT=2
+# bump for non-ABI changes, reset to zero when CURRENT changes
+XCOMPOSITE_REVISION=0
+# bump when the ABI changes in backward-compatible fashion
+XCOMPOSITE_AGE=1
+libXcomposite_la_LDFLAGS = -version-info ${XCOMPOSITE_CURRENT}:${XCOMPOSITE_REVISION}:${XCOMPOSITE_AGE} -no-undefined
+
+libXcompositeincludedir = $(includedir)/X11/extensions
+libXcompositeinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xcomposite.h