summaryrefslogtreecommitdiff
path: root/proto
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2009-05-22 15:11:03 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2009-05-22 15:11:03 +0000
commit17c879d1ae801cf6c94e890324cff491f19aef32 (patch)
tree965f98fe860fad6c727289cce65469e546672b94 /proto
parent41995eb1e23320256b1b982c473c2a01b71218e9 (diff)
Get rid of double-column rules in proto Makefiles.
Diffstat (limited to 'proto')
-rw-r--r--proto/compositeproto/Makefile4
-rw-r--r--proto/damageproto/Makefile4
-rw-r--r--proto/randrproto/Makefile4
-rw-r--r--proto/renderproto/Makefile4
-rw-r--r--proto/x11proto/Makefile12
5 files changed, 16 insertions, 12 deletions
diff --git a/proto/compositeproto/Makefile b/proto/compositeproto/Makefile
index 7ee028630..298d641d7 100644
--- a/proto/compositeproto/Makefile
+++ b/proto/compositeproto/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
+# $OpenBSD: Makefile,v 1.2 2009/05/22 15:11:02 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= composite.h compositeproto.h
PKGCONFIG= compositeproto.pc
-install:: compositeproto.txt
+afterinstall: compositeproto.txt
${INSTALL_DATA} ${.CURDIR}/compositeproto.txt \
${DESTDIR}${X11BASE}/share/doc/compositeproto
diff --git a/proto/damageproto/Makefile b/proto/damageproto/Makefile
index c6703c821..bcf0ce8c9 100644
--- a/proto/damageproto/Makefile
+++ b/proto/damageproto/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
+# $OpenBSD: Makefile,v 1.2 2009/05/22 15:11:02 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= damageproto.h damagewire.h
PKGCONFIG= damageproto.pc
-install:: damageproto.txt
+afterinstall: damageproto.txt
${INSTALL_DATA} ${.CURDIR}/damageproto.txt \
${DESTDIR}${X11BASE}/share/doc/damageproto
diff --git a/proto/randrproto/Makefile b/proto/randrproto/Makefile
index 3932db4da..115b01044 100644
--- a/proto/randrproto/Makefile
+++ b/proto/randrproto/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+# $OpenBSD: Makefile,v 1.2 2009/05/22 15:11:02 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= randr.h randrproto.h
PKGCONFIG= randrproto.pc
-install:: randrproto.txt
+afterinstall: randrproto.txt
${INSTALL_DATA} ${.CURDIR}/randrproto.txt \
${DESTDIR}${X11BASE}/share/doc/randrproto
diff --git a/proto/renderproto/Makefile b/proto/renderproto/Makefile
index 5d62fae59..231a27a76 100644
--- a/proto/renderproto/Makefile
+++ b/proto/renderproto/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+# $OpenBSD: Makefile,v 1.2 2009/05/22 15:11:02 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= render.h renderproto.h
PKGCONFIG= renderproto.pc
-install:: renderproto.txt
+afterinstall: renderproto.txt
${INSTALL_DATA} ${.CURDIR}/renderproto.txt \
${DESTDIR}${X11BASE}/share/doc/renderproto
diff --git a/proto/x11proto/Makefile b/proto/x11proto/Makefile
index 7d688e7de..cc7c4f51d 100644
--- a/proto/x11proto/Makefile
+++ b/proto/x11proto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+# $OpenBSD: Makefile,v 1.2 2009/05/22 15:11:02 matthieu Exp $
HEADERS_SUBDIR= X11/
HEADERS= ap_keysym.h DECkeysym.h HPkeysym.h keysymdef.h keysym.h \
@@ -9,7 +9,7 @@ HEADERS= ap_keysym.h DECkeysym.h HPkeysym.h keysymdef.h keysym.h \
GENERATED_HEADERS= Xfuncproto.h Xpoll.h
PKGCONFIG= xproto.pc
-all:: ${GENERATED_HEADERS}
+all: ${GENERATED_HEADERS}
Xfuncproto.h: Xfuncproto.h.in
@sed -e 's,^#undef NARROWPROTO,#define NARROWPROTO,' \
@@ -19,14 +19,18 @@ Xfuncproto.h: Xfuncproto.h.in
Xpoll.h: Xpoll.h.in
@sed -e 's#@USE_FDS_BITS@#fds_bits#g' ${.CURDIR}/Xpoll.h.in > $@
-install:: ${GENERATED_HEADERS}
+install-gh: ${GENERATED_HEADERS}
@echo installing ${GENERATED_HEADERS} in ${INCSDIR}/${HEADERS_SUBDIR}
@for i in ${GENERATED_HEADERS}; do \
cmp -s $$i ${DESTDIR}${INCSDIR}/$$i || \
${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/${HEADERS_SUBDIR}$$i;\
done
-clean::
+clean-gh:
rm -f ${GENERATED_HEADERS}
+realinstall: install-gh
+
+clean: clean-gh
+
.include <bsd.xorg.mk>