summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libxcb/Makefile.inc10
-rw-r--r--lib/libxcb/libxcb-composite/Makefile8
-rw-r--r--lib/libxcb/libxcb-damage/Makefile8
-rw-r--r--lib/libxcb/libxcb-dpms/Makefile8
-rw-r--r--lib/libxcb/libxcb-glx/Makefile8
-rw-r--r--lib/libxcb/libxcb-randr/Makefile8
-rw-r--r--lib/libxcb/libxcb-record/Makefile8
-rw-r--r--lib/libxcb/libxcb-render/Makefile8
-rw-r--r--lib/libxcb/libxcb-res/Makefile8
-rw-r--r--lib/libxcb/libxcb-screensaver/Makefile8
-rw-r--r--lib/libxcb/libxcb-shape/Makefile8
-rw-r--r--lib/libxcb/libxcb-shm/Makefile8
-rw-r--r--lib/libxcb/libxcb-sync/Makefile8
-rw-r--r--lib/libxcb/libxcb-xevie/Makefile8
-rw-r--r--lib/libxcb/libxcb-xf86dri/Makefile8
-rw-r--r--lib/libxcb/libxcb-xfixes/Makefile8
-rw-r--r--lib/libxcb/libxcb-xinerama/Makefile8
-rw-r--r--lib/libxcb/libxcb-xprint/Makefile8
-rw-r--r--lib/libxcb/libxcb-xtest/Makefile8
-rw-r--r--lib/libxcb/libxcb-xv/Makefile8
-rw-r--r--lib/libxcb/libxcb-xvmc/Makefile8
-rw-r--r--lib/libxcb/libxcb/Makefile10
22 files changed, 90 insertions, 90 deletions
diff --git a/lib/libxcb/Makefile.inc b/lib/libxcb/Makefile.inc
index 717dc29c7..8c483212a 100644
--- a/lib/libxcb/Makefile.inc
+++ b/lib/libxcb/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.1 2009/05/22 16:09:01 matthieu Exp $
+# $OpenBSD: Makefile.inc,v 1.2 2009/05/22 16:53:05 matthieu Exp $
LIBXCB= ${.CURDIR}/../../../dist/libxcb
@@ -12,10 +12,8 @@ CPPFLAGS= -I${X11BASE}/include \
obj: _xenocara_obj
-includes:
- @cd ${.CURDIR}/../src; for i in ${HDRS}; do \
- cmp -s $$i ${DESTDIR}${INCSDIR}/xcb/$$i || \
- ${INSTALL} ${INSTALL_COPY} -m 444 -o ${BINOWN} -g ${BINGRP} $$i \
- ${DESTDIR}/${INCSDIR}/xcb; done
+HEADERS_SUBDIR= xcb/
+
+_SRCDIR?= ${.CURDIR}/../src
PACKAGE_VERSION!=m4 ${XSRCDIR}/share/mk/package_version.m4 ${LIBXCB}/configure.ac
diff --git a/lib/libxcb/libxcb-composite/Makefile b/lib/libxcb/libxcb-composite/Makefile
index 6553a8110..ea8bd3633 100644
--- a/lib/libxcb/libxcb-composite/Makefile
+++ b/lib/libxcb/libxcb-composite/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:47 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-composite
+LIB= xcb-composite
-HDRS= composite.h
+HEADERS= composite.h
-SRCS= composite.c
+SRCS= composite.c
PKGCONFIG= xcb-composite.pc
diff --git a/lib/libxcb/libxcb-damage/Makefile b/lib/libxcb/libxcb-damage/Makefile
index a09c33a0f..9c61311cd 100644
--- a/lib/libxcb/libxcb-damage/Makefile
+++ b/lib/libxcb/libxcb-damage/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:47 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-damage
+LIB= xcb-damage
-HDRS= damage.h
+HEADERS= damage.h
-SRCS= damage.c
+SRCS= damage.c
PKGCONFIG= xcb-damage.pc
diff --git a/lib/libxcb/libxcb-dpms/Makefile b/lib/libxcb/libxcb-dpms/Makefile
index 839d7dc49..8ac649fc9 100644
--- a/lib/libxcb/libxcb-dpms/Makefile
+++ b/lib/libxcb/libxcb-dpms/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:47 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-dpms
+LIB= xcb-dpms
-HDRS= dpms.h
+HEADERS= dpms.h
-SRCS= dpms.c
+SRCS= dpms.c
PKGCONFIG= xcb-dpms.pc
diff --git a/lib/libxcb/libxcb-glx/Makefile b/lib/libxcb/libxcb-glx/Makefile
index c84bea0d4..673ff4425 100644
--- a/lib/libxcb/libxcb-glx/Makefile
+++ b/lib/libxcb/libxcb-glx/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:47 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-glx
+LIB= xcb-glx
-HDRS= glx.h
+HEADERS= glx.h
-SRCS= glx.c
+SRCS= glx.c
PKGCONFIG= xcb-glx.pc
diff --git a/lib/libxcb/libxcb-randr/Makefile b/lib/libxcb/libxcb-randr/Makefile
index 05aa9d942..9bb2c2e10 100644
--- a/lib/libxcb/libxcb-randr/Makefile
+++ b/lib/libxcb/libxcb-randr/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:47 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-randr
+LIB= xcb-randr
-HDRS= randr.h
+HEADERS= randr.h
-SRCS= randr.c
+SRCS= randr.c
PKGCONFIG= xcb-randr.pc
diff --git a/lib/libxcb/libxcb-record/Makefile b/lib/libxcb/libxcb-record/Makefile
index bc7a60ff5..46ae08ce9 100644
--- a/lib/libxcb/libxcb-record/Makefile
+++ b/lib/libxcb/libxcb-record/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:47 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-record
+LIB= xcb-record
-HDRS= record.h
+HEADERS= record.h
-SRCS= record.c
+SRCS= record.c
PKGCONFIG= xcb-record.pc
diff --git a/lib/libxcb/libxcb-render/Makefile b/lib/libxcb/libxcb-render/Makefile
index f19f5c469..5fbd2ae8d 100644
--- a/lib/libxcb/libxcb-render/Makefile
+++ b/lib/libxcb/libxcb-render/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:47 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-render
+LIB= xcb-render
-HDRS= render.h
+HEADERS= render.h
-SRCS= render.c
+SRCS= render.c
PKGCONFIG= xcb-render.pc
diff --git a/lib/libxcb/libxcb-res/Makefile b/lib/libxcb/libxcb-res/Makefile
index 2e929bfc8..04fdf9786 100644
--- a/lib/libxcb/libxcb-res/Makefile
+++ b/lib/libxcb/libxcb-res/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:47 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-res
+LIB= xcb-res
-HDRS= res.h
+HEADERS= res.h
-SRCS= res.c
+SRCS= res.c
PKGCONFIG= xcb-res.pc
diff --git a/lib/libxcb/libxcb-screensaver/Makefile b/lib/libxcb/libxcb-screensaver/Makefile
index 9d48af7cc..a8350f9e7 100644
--- a/lib/libxcb/libxcb-screensaver/Makefile
+++ b/lib/libxcb/libxcb-screensaver/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:47 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-screensaver
+LIB= xcb-screensaver
-HDRS= screensaver.h
+HEADERS= screensaver.h
-SRCS= screensaver.c
+SRCS= screensaver.c
PKGCONFIG= xcb-screensaver.pc
diff --git a/lib/libxcb/libxcb-shape/Makefile b/lib/libxcb/libxcb-shape/Makefile
index 261dfc8b5..99c39133c 100644
--- a/lib/libxcb/libxcb-shape/Makefile
+++ b/lib/libxcb/libxcb-shape/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:47 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-shape
+LIB= xcb-shape
-HDRS= shape.h
+HEADERS= shape.h
-SRCS= shape.c
+SRCS= shape.c
PKGCONFIG= xcb-shape.pc
diff --git a/lib/libxcb/libxcb-shm/Makefile b/lib/libxcb/libxcb-shm/Makefile
index 1eeb413a2..4adb3fc72 100644
--- a/lib/libxcb/libxcb-shm/Makefile
+++ b/lib/libxcb/libxcb-shm/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:47 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-shm
+LIB= xcb-shm
-HDRS= shm.h
+HEADERS= shm.h
-SRCS= shm.c
+SRCS= shm.c
PKGCONFIG= xcb-shm.pc
diff --git a/lib/libxcb/libxcb-sync/Makefile b/lib/libxcb/libxcb-sync/Makefile
index bb9226f0a..e5aad428d 100644
--- a/lib/libxcb/libxcb-sync/Makefile
+++ b/lib/libxcb/libxcb-sync/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:47 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-sync
+LIB= xcb-sync
-HDRS= sync.h
+HEADERS= sync.h
-SRCS= sync.c
+SRCS= sync.c
PKGCONFIG= xcb-sync.pc
diff --git a/lib/libxcb/libxcb-xevie/Makefile b/lib/libxcb/libxcb-xevie/Makefile
index 8f99c3ea5..49674bad6 100644
--- a/lib/libxcb/libxcb-xevie/Makefile
+++ b/lib/libxcb/libxcb-xevie/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:47 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-xevie
+LIB= xcb-xevie
-HDRS= xevie.h
+HEADERS= xevie.h
-SRCS= xevie.c
+SRCS= xevie.c
PKGCONFIG= xcb-xevie.pc
diff --git a/lib/libxcb/libxcb-xf86dri/Makefile b/lib/libxcb/libxcb-xf86dri/Makefile
index 268f53c80..4dc688f96 100644
--- a/lib/libxcb/libxcb-xf86dri/Makefile
+++ b/lib/libxcb/libxcb-xf86dri/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:47 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-xf86dri
+LIB= xcb-xf86dri
-HDRS= xf86dri.h
+HEADERS= xf86dri.h
-SRCS= xf86dri.c
+SRCS= xf86dri.c
PKGCONFIG= xcb-xf86dri.pc
diff --git a/lib/libxcb/libxcb-xfixes/Makefile b/lib/libxcb/libxcb-xfixes/Makefile
index a62d7aebb..896fd1f43 100644
--- a/lib/libxcb/libxcb-xfixes/Makefile
+++ b/lib/libxcb/libxcb-xfixes/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:47 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-xfixes
+LIB= xcb-xfixes
-HDRS= xfixes.h
+HEADERS= xfixes.h
-SRCS= xfixes.c
+SRCS= xfixes.c
PKGCONFIG= xcb-xfixes.pc
diff --git a/lib/libxcb/libxcb-xinerama/Makefile b/lib/libxcb/libxcb-xinerama/Makefile
index 535d550ec..37d94b857 100644
--- a/lib/libxcb/libxcb-xinerama/Makefile
+++ b/lib/libxcb/libxcb-xinerama/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:48 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-xinerama
+LIB= xcb-xinerama
-HDRS= xinerama.h
+HEADERS= xinerama.h
-SRCS= xinerama.c
+SRCS= xinerama.c
PKGCONFIG= xcb-xinerama.pc
diff --git a/lib/libxcb/libxcb-xprint/Makefile b/lib/libxcb/libxcb-xprint/Makefile
index 0e6aee26e..fbe74a6c5 100644
--- a/lib/libxcb/libxcb-xprint/Makefile
+++ b/lib/libxcb/libxcb-xprint/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:48 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-xprint
+LIB= xcb-xprint
-HDRS= xprint.h
+HEADERS= xprint.h
-SRCS= xprint.c
+SRCS= xprint.c
PKGCONFIG= xcb-xprint.pc
diff --git a/lib/libxcb/libxcb-xtest/Makefile b/lib/libxcb/libxcb-xtest/Makefile
index 1d968f070..1089448c1 100644
--- a/lib/libxcb/libxcb-xtest/Makefile
+++ b/lib/libxcb/libxcb-xtest/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:48 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-xtest
+LIB= xcb-xtest
-HDRS= xtest.h
+HEADERS= xtest.h
-SRCS= xtest.c
+SRCS= xtest.c
PKGCONFIG= xcb-xtest.pc
diff --git a/lib/libxcb/libxcb-xv/Makefile b/lib/libxcb/libxcb-xv/Makefile
index 5bca8f86e..2fc1023a9 100644
--- a/lib/libxcb/libxcb-xv/Makefile
+++ b/lib/libxcb/libxcb-xv/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:48 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-xv
+LIB= xcb-xv
-HDRS= xv.h
+HEADERS= xv.h
-SRCS= xv.c
+SRCS= xv.c
PKGCONFIG= xcb-xv.pc
diff --git a/lib/libxcb/libxcb-xvmc/Makefile b/lib/libxcb/libxcb-xvmc/Makefile
index e217dc195..cd6bd0fa8 100644
--- a/lib/libxcb/libxcb-xvmc/Makefile
+++ b/lib/libxcb/libxcb-xvmc/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/05/22 16:22:48 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb-xvmc
+LIB= xcb-xvmc
-HDRS= xvmc.h
+HEADERS= xvmc.h
-SRCS= xvmc.c
+SRCS= xvmc.c
PKGCONFIG= xcb-xvmc.pc
diff --git a/lib/libxcb/libxcb/Makefile b/lib/libxcb/libxcb/Makefile
index 3d60b98e6..fa9e589be 100644
--- a/lib/libxcb/libxcb/Makefile
+++ b/lib/libxcb/libxcb/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.1 2009/05/22 16:09:01 matthieu Exp $
+# $OpenBSD: Makefile,v 1.2 2009/05/22 16:53:05 matthieu Exp $
-LIB= xcb
+LIB= xcb
-HDRS= xcb.h \
- xcb_ext.h
+HEADERS= xcb.h \
+ xcbext.h
+
+_SRCDIR= ${LIBXCB}/src
SRCS= \
xcb_conn.c \