Replace autotools based build by native BSD Makefiles in proto/.

tested by naddy@ and oga@. ok oga@.
This commit is contained in:
matthieu 2008-03-25 23:28:19 +00:00
parent 4c940d52e3
commit 736c23fba4
63 changed files with 314 additions and 101 deletions

View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.4 2008/02/02 17:19:57 matthieu Exp $
# $OpenBSD: Makefile,v 1.5 2008/03/25 23:28:19 matthieu Exp $
.include <bsd.own.mk>
.include <bsd.xconf.mk>
SUBDIR= bigreqsproto compositeproto dmxproto damageproto evieproto \
fixesproto fontcacheproto fontsproto glproto inputproto \
@ -10,7 +10,7 @@ SUBDIR= bigreqsproto compositeproto dmxproto damageproto evieproto \
xf86bigfontproto xf86dgaproto xf86miscproto \
xf86rushproto xf86vidmodeproto
.if defined(XENOCARA_BUILD_DRI) && ${XENOCARA_BUILD_DRI:L} == "yes"
.if ${XENOCARA_BUILD_DRI:L} == "yes"
SUBDIR+= xf86driproto
.endif

View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= bigreqstr.h
PKGCONFIG= bigreqsproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,11 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= composite.h compositeproto.h
PKGCONFIG= compositeproto.pc
install:: compositeproto.txt
${INSTALL_DATA} ${.CURDIR}/compositeproto.txt \
${DESTDIR}${X11BASE}/share/doc/compositeproto
.include <bsd.xorg.mk>

View File

@ -1,4 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,11 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= damageproto.h damagewire.h
PKGCONFIG= damageproto.pc
install:: damageproto.txt
${INSTALL_DATA} ${.CURDIR}/damageproto.txt \
${DESTDIR}${X11BASE}/share/doc/damageproto
.include <bsd.xorg.mk>

View File

@ -1,4 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

7
proto/dmxproto/Makefile Normal file
View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= dmxext.h dmxproto.h
PKGCONFIG= dmxproto.pc
.include <bsd.xorg.mk>

View File

@ -1,4 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

7
proto/evieproto/Makefile Normal file
View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= Xeviestr.h
PKGCONFIG= evieproto.pc
.include <bsd.xorg.mk>

View File

@ -1,4 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= xfixesproto.h xfixeswire.h
PKGCONFIG= fixesproto.pc
.include <bsd.xorg.mk>

View File

@ -1,4 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= fontcache.h fontcacheP.h fontcachstr.h
PKGCONFIG= fontcacheproto.pc
.include <bsd.xorg.mk>

View File

@ -1,4 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
HEADERS_SUBDIR= X11/fonts/
HEADERS= font.h fontproto.h fontstruct.h FS.h fsmasks.h FSproto.h
PKGCONFIG= fontsproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

8
proto/glproto/Makefile Normal file
View File

@ -0,0 +1,8 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
HEADERS_SUBDIRS= GL GL/internal
HEADERS_GL= glxint.h glxmd.h glxproto.h glxtokens.h
HEADERS_GL_internal= glcore.h
PKGCONFIG= glproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= XI.h XInput.h XIproto.h
PKGCONFIG= inputproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

7
proto/kbproto/Makefile Normal file
View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= XKBgeom.h XKB.h XKBproto.h XKBsrv.h XKBstr.h
PKGCONFIG= kbproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

7
proto/pmproto/Makefile Normal file
View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
HEADERS_SUBDIR= X11/PM/
HEADERS= PM.h PMproto.h
PKGCONFIG= xproxymngproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= Print.h Printstr.h
PKGCONFIG= printproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

11
proto/randrproto/Makefile Normal file
View File

@ -0,0 +1,11 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= randr.h randrproto.h
PKGCONFIG= randrproto.pc
install:: randrproto.txt
${INSTALL_DATA} ${.CURDIR}/randrproto.txt \
${DESTDIR}${X11BASE}/share/doc/randrproto
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= record.h recordstr.h
PKGCONFIG= recordproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,11 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= render.h renderproto.h
PKGCONFIG= renderproto.pc
install:: renderproto.txt
${INSTALL_DATA} ${.CURDIR}/renderproto.txt \
${DESTDIR}${X11BASE}/share/doc/renderproto
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= XResproto.h
PKGCONFIG= resourceproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= saver.h saverproto.h scrnsaver.h
PKGCONFIG= scrnsaverproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

8
proto/trapproto/Makefile Normal file
View File

@ -0,0 +1,8 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h \
xtraplibp.h xtrapproto.h
PKGCONFIG= trapproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= vldXvMC.h Xv.h XvMC.h XvMCproto.h Xvproto.h
PKGCONFIG= videoproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

32
proto/x11proto/Makefile Normal file
View File

@ -0,0 +1,32 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
HEADERS_SUBDIR= X11/
HEADERS= ap_keysym.h DECkeysym.h HPkeysym.h keysymdef.h keysym.h \
Sunkeysym.h Xalloca.h Xarch.h Xatom.h Xdefs.h XF86keysym.h \
Xfuncs.h X.h Xmd.h Xosdefs.h Xos.h Xos_r.h Xproto.h \
Xprotostr.h Xthreads.h Xw32defs.h XWDFile.h Xwindows.h \
Xwinsock.h
GENERATED_HEADERS= Xfuncproto.h Xpoll.h
PKGCONFIG= xproto.pc
all:: ${GENERATED_HEADERS}
Xfuncproto.h: Xfuncproto.h.in
@sed -e 's,^#undef NARROWPROTO,#define NARROWPROTO,' \
-e 's,^#undef FUNCPROTO,#define FUNCPROTO 15,' \
${.CURDIR}/Xfuncproto.h.in > $@
Xpoll.h: Xpoll.h.in
@sed -e 's#@USE_FDS_BITS@#fds_bits#g' ${.CURDIR}/Xpoll.h.in > $@
install:: ${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::
rm -f ${GENERATED_HEADERS}
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= xcmiscstr.h
PKGCONFIG= xcmiscproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
.include <bsd.xorg.mk>

13
proto/xextproto/Makefile Normal file
View File

@ -0,0 +1,13 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= dpms.h dpmsstr.h extutil.h lbxbuf.h lbxbufstr.h \
lbxdeltastr.h lbximage.h lbxopts.h lbxstr.h lbxzlib.h \
MITMisc.h mitmiscstr.h multibuf.h multibufst.h security.h \
securstr.h shape.h shapestr.h shmstr.h sync.h syncstr.h \
Xag.h Xagsrv.h Xagstr.h Xcup.h Xcupstr.h Xdbe.h \
Xdbeproto.h XEVI.h XEVIstr.h Xext.h XLbx.h XShm.h \
xtestext1.h XTest.h xteststr.h
PKGCONFIG= xextproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:26 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= xf86bigfont.h xf86bigfstr.h
PKGCONFIG= xf86bigfontproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:26 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= xf86dga1.h xf86dga1str.h xf86dga.h xf86dgastr.h
PKGCONFIG= xf86dgaproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:26 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,8 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
HEADERS_SUBDIRS= X11/dri GL/internal
HEADERS_X11_dri= xf86dri.h xf86dristr.h
HEADERS_GL_internal= dri_interface.h
PKGCONFIG= xf86driproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:26 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= xf86misc.h xf86mscstr.h
PKGCONFIG= xf86miscproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:26 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= xf86rush.h xf86rushstr.h
PKGCONFIG= xf86rushproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:26 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= xf86vmode.h xf86vmstr.h
PKGCONFIG= xf86vidmodeproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:26 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= panoramiXext.h panoramiXproto.h Xinerama.h
PKGCONFIG= xineramaproto.pc
.include <bsd.xorg.mk>

View File

@ -1,3 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:26 matthieu Exp $
.include <bsd.xorg.mk>

View File

@ -1,4 +1,4 @@
# $OpenBSD: bsd.xorg.mk,v 1.23 2008/03/03 07:01:44 matthieu Exp $ -*- makefile -*-
# $OpenBSD: bsd.xorg.mk,v 1.24 2008/03/25 23:28:19 matthieu Exp $ -*- makefile -*-
#
# Copyright © 2006 Matthieu Herrb
#
@ -54,6 +54,51 @@ AUTOTOOLS_ENV= AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \
ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \
$(CONFIGURE_ENV)
##
## Default rules
##
# pkgconfig
.if defined(PKGCONFIG)
PACKAGE_VERSION!=m4 ${XSRCDIR}/share/mk/package_version.m4 ${.CURDIR}/configure.ac
all:: ${PKGCONFIG}
${PKGCONFIG}: ${PKGCONFIG}.in
@sed -e 's#@prefix@#${X11BASE}#g' \
-e 's#@exec_prefix@#$${prefix}#g' \
-e 's#@libdir@#$${exec_prefix}/lib#g' \
-e 's#@includedir@#$${prefix}/include#g' \
-e 's#@PACKAGE_VERSION@#${PACKAGE_VERSION}#g' \
< ${.CURDIR}/${PKGCONFIG}.in > $@
install:: ${PKGCONFIG}
${INSTALL_DATA} ${PKGCONFIG} ${DESTDIR}${LIBDIR}/pkgconfig
clean::
rm -f ${PKGCONFIG}
.endif
# headers
.if defined(HEADERS)
install::
@echo installing ${HEADERS} in ${INCSDIR}/${HEADERS_SUBDIR}
@cd ${.CURDIR}; for i in ${HEADERS}; do \
cmp -s $$i ${DESTDIR}${INCSDIR}/${HEADERS_SUBDIR}$$i || \
${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/${HEADERS_SUBDIR}$$i;\
done
.endif
.if defined(HEADERS_SUBDIRS)
.for d in ${HEADERS_SUBDIRS}
install::
@echo installing ${HEADERS_${d:S/\//_/}} in ${INCSDIR}/${d}
@cd ${.CURDIR}; for i in ${HEADERS_${d:S/\//_/}}; do \
cmp -s $$i ${DESTDIR}${INCSDIR}/$d/$$i || \
${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/${d}; \
done
.endfor
.endif
.if !target(.MAIN)
.MAIN: all
.endif

View File

@ -0,0 +1,4 @@
dnl $OpenBSD: package_version.m4,v 1.1 2008/03/25 23:28:19 matthieu Exp $
define(AC_INIT,`changequote([,])divert(0)'$2
`divert(-1)')dnl
divert(-1)dnl