head	1.14;
access;
symbols
	netbsd-11-0-RC4:1.14
	netbsd-11-0-RC3:1.14
	netbsd-11-0-RC2:1.14
	netbsd-11-0-RC1:1.14
	perseant-exfatfs-base-20250801:1.14
	netbsd-11:1.14.0.16
	netbsd-11-base:1.14
	netbsd-10-1-RELEASE:1.14
	perseant-exfatfs-base-20240630:1.14
	perseant-exfatfs:1.14.0.14
	perseant-exfatfs-base:1.14
	netbsd-8-3-RELEASE:1.12
	netbsd-9-4-RELEASE:1.14
	netbsd-10-0-RELEASE:1.14
	netbsd-10-0-RC6:1.14
	netbsd-10-0-RC5:1.14
	netbsd-10-0-RC4:1.14
	netbsd-10-0-RC3:1.14
	netbsd-10-0-RC2:1.14
	netbsd-10-0-RC1:1.14
	netbsd-10:1.14.0.12
	netbsd-10-base:1.14
	netbsd-9-3-RELEASE:1.14
	cjep_sun2x-base1:1.14
	cjep_sun2x:1.14.0.10
	cjep_sun2x-base:1.14
	cjep_staticlib_x-base1:1.14
	netbsd-9-2-RELEASE:1.14
	cjep_staticlib_x:1.14.0.8
	cjep_staticlib_x-base:1.14
	netbsd-9-1-RELEASE:1.14
	phil-wifi-20200421:1.14
	phil-wifi-20200411:1.14
	is-mlppp:1.14.0.6
	is-mlppp-base:1.14
	phil-wifi-20200406:1.14
	netbsd-8-2-RELEASE:1.12
	netbsd-9-0-RELEASE:1.14
	netbsd-9-0-RC2:1.14
	netbsd-9-0-RC1:1.14
	phil-wifi-20191119:1.14
	netbsd-9:1.14.0.4
	netbsd-9-base:1.14
	phil-wifi-20190609:1.14
	netbsd-8-1-RELEASE:1.12
	netbsd-8-1-RC1:1.12
	pgoyette-compat-merge-20190127:1.13.2.1
	pgoyette-compat-20190127:1.14
	pgoyette-compat-20190118:1.14
	pgoyette-compat-1226:1.14
	pgoyette-compat-1126:1.14
	pgoyette-compat-1020:1.14
	pgoyette-compat-0930:1.14
	pgoyette-compat-0906:1.14
	netbsd-7-2-RELEASE:1.9
	pgoyette-compat-0728:1.14
	netbsd-8-0-RELEASE:1.12
	phil-wifi:1.14.0.2
	phil-wifi-base:1.14
	pgoyette-compat-0625:1.14
	netbsd-8-0-RC2:1.12
	pgoyette-compat-0521:1.14
	pgoyette-compat-0502:1.14
	pgoyette-compat-0422:1.14
	netbsd-8-0-RC1:1.12
	pgoyette-compat-0415:1.14
	pgoyette-compat-0407:1.14
	pgoyette-compat-0330:1.14
	pgoyette-compat-0322:1.14
	pgoyette-compat-0315:1.14
	netbsd-7-1-2-RELEASE:1.9
	pgoyette-compat:1.13.0.2
	pgoyette-compat-base:1.13
	netbsd-7-1-1-RELEASE:1.9
	matt-nb8-mediatek:1.12.0.12
	matt-nb8-mediatek-base:1.12
	perseant-stdc-iso10646:1.12.0.10
	perseant-stdc-iso10646-base:1.12
	netbsd-8:1.12.0.8
	netbsd-8-base:1.12
	prg-localcount2-base3:1.12
	prg-localcount2-base2:1.12
	prg-localcount2-base1:1.12
	prg-localcount2:1.12.0.6
	prg-localcount2-base:1.12
	pgoyette-localcount-20170426:1.12
	bouyer-socketcan-base1:1.12
	pgoyette-localcount-20170320:1.12
	netbsd-7-1:1.9.0.12
	netbsd-7-1-RELEASE:1.9
	netbsd-7-1-RC2:1.9
	netbsd-7-nhusb-base-20170116:1.9
	bouyer-socketcan:1.12.0.4
	bouyer-socketcan-base:1.12
	pgoyette-localcount-20170107:1.12
	netbsd-7-1-RC1:1.9
	pgoyette-localcount-20161104:1.12
	netbsd-7-0-2-RELEASE:1.9
	localcount-20160914:1.12
	netbsd-7-nhusb:1.9.0.10
	netbsd-7-nhusb-base:1.9
	pgoyette-localcount-20160806:1.12
	pgoyette-localcount-20160726:1.12
	pgoyette-localcount:1.12.0.2
	pgoyette-localcount-base:1.12
	netbsd-7-0-1-RELEASE:1.9
	netbsd-7-0:1.9.0.8
	netbsd-7-0-RELEASE:1.9
	netbsd-7-0-RC3:1.9
	netbsd-7-0-RC2:1.9
	netbsd-7-0-RC1:1.9
	netbsd-5-2-3-RELEASE:1.2.4.2
	netbsd-5-1-5-RELEASE:1.2.4.2
	netbsd-6-0-6-RELEASE:1.8
	netbsd-6-1-5-RELEASE:1.8
	netbsd-7:1.9.0.6
	netbsd-7-base:1.9
	yamt-pagecache-base9:1.9
	yamt-pagecache-tag8:1.8
	netbsd-6-1-4-RELEASE:1.8
	netbsd-6-0-5-RELEASE:1.8
	tls-earlyentropy:1.9.0.4
	tls-earlyentropy-base:1.9
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.9
	riastradh-drm2-base3:1.9
	netbsd-6-1-3-RELEASE:1.8
	netbsd-6-0-4-RELEASE:1.8
	netbsd-5-2-2-RELEASE:1.2.4.2
	netbsd-5-1-4-RELEASE:1.2.4.2
	netbsd-6-1-2-RELEASE:1.8
	netbsd-6-0-3-RELEASE:1.8
	netbsd-5-2-1-RELEASE:1.2.4.2
	netbsd-5-1-3-RELEASE:1.2.4.2
	netbsd-6-1-1-RELEASE:1.8
	riastradh-drm2-base2:1.9
	riastradh-drm2-base1:1.9
	riastradh-drm2:1.9.0.2
	riastradh-drm2-base:1.9
	netbsd-6-1:1.8.0.20
	netbsd-6-0-2-RELEASE:1.8
	netbsd-6-1-RELEASE:1.8
	netbsd-6-1-RC4:1.8
	netbsd-6-1-RC3:1.8
	agc-symver:1.8.0.18
	agc-symver-base:1.8
	netbsd-6-1-RC2:1.8
	netbsd-6-1-RC1:1.8
	yamt-pagecache-base8:1.8
	netbsd-5-2:1.2.4.2.0.6
	netbsd-6-0-1-RELEASE:1.8
	yamt-pagecache-base7:1.8
	netbsd-5-2-RELEASE:1.2.4.2
	netbsd-5-2-RC1:1.2.4.2
	matt-nb6-plus-nbase:1.8
	yamt-pagecache-base6:1.8
	netbsd-6-0:1.8.0.14
	netbsd-6-0-RELEASE:1.8
	netbsd-6-0-RC2:1.8
	tls-maxphys:1.8.0.12
	tls-maxphys-base:1.9
	matt-nb6-plus:1.8.0.10
	matt-nb6-plus-base:1.8
	netbsd-6-0-RC1:1.8
	yamt-pagecache-base5:1.8
	yamt-pagecache-base4:1.8
	netbsd-6:1.8.0.8
	netbsd-6-base:1.8
	netbsd-5-1-2-RELEASE:1.2.4.2
	netbsd-5-1-1-RELEASE:1.2.4.2
	yamt-pagecache-base3:1.8
	yamt-pagecache-base2:1.8
	yamt-pagecache:1.8.0.6
	yamt-pagecache-base:1.8
	cherry-xenmp:1.8.0.4
	cherry-xenmp-base:1.8
	bouyer-quota2-nbase:1.8
	bouyer-quota2:1.8.0.2
	bouyer-quota2-base:1.8
	matt-mips64-premerge-20101231:1.8
	matt-nb5-mips64-premerge-20101231:1.2.4.1.4.1
	matt-nb5-pq3:1.2.4.2.0.4
	matt-nb5-pq3-base:1.2.4.2
	netbsd-5-1:1.2.4.2.0.2
	netbsd-5-1-RELEASE:1.2.4.2
	netbsd-5-1-RC4:1.2.4.2
	matt-nb5-mips64-k15:1.2.4.1.4.1
	netbsd-5-1-RC3:1.2.4.2
	netbsd-5-1-RC2:1.2.4.2
	netbsd-5-1-RC1:1.2.4.2
	netbsd-5-0-2-RELEASE:1.2.4.1
	matt-nb5-mips64-premerge-20091211:1.2.4.1
	matt-premerge-20091211:1.5
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.2.4.1
	matt-nb4-mips64-k7-u2a-k9b:1.2.4.1
	matt-nb5-mips64-u1-k1-k5:1.2.4.1
	matt-nb5-mips64:1.2.4.1.0.4
	netbsd-5-0-1-RELEASE:1.2.4.1
	jym-xensuspend-nbase:1.3
	netbsd-5-0:1.2.4.1.0.2
	netbsd-5-0-RELEASE:1.2.4.1
	netbsd-5-0-RC4:1.2.4.1
	netbsd-5-0-RC3:1.2.4.1
	netbsd-5-0-RC2:1.2.4.1
	jym-xensuspend:1.3.0.2
	jym-xensuspend-base:1.3
	netbsd-5-0-RC1:1.2.4.1
	haad-dm-base:1.3
	haad-dm-base2:1.3
	haad-nbase2:1.3
	netbsd-5:1.2.0.4
	netbsd-5-base:1.2
	matt-mips64-base2:1.2
	haad-dm:1.2.0.2
	haad-dm-base1:1.2
	wrstuden-revivesa-base-3:1.1.1.1
	wrstuden-revivesa:1.1.1.1.0.2
	wrstuden-revivesa-base-2:1.1.1.1
	oinkoink:1.1.1.1
	mrg-and-rtr:1.1.1;
locks; strict;
comment	@# @;


1.14
date	2018.03.11.10.17.10;	author mrg;	state Exp;
branches;
next	1.13;
commitid	axWJ07L4BwVAE1uA;

1.13
date	2018.03.03.03.34.17;	author mrg;	state Exp;
branches
	1.13.2.1;
next	1.12;
commitid	mKg0pNcFYVbkGXsA;

1.12
date	2015.07.17.17.57.11;	author mrg;	state Exp;
branches;
next	1.11;
commitid	HLaW5UEVcfUzjFty;

1.11
date	2015.07.17.08.30.33;	author mrg;	state Exp;
branches;
next	1.10;
commitid	WuFPy91seL0VaCty;

1.10
date	2014.08.24.18.27.16;	author apb;	state Exp;
branches;
next	1.9;
commitid	NlInJ55qi4aXYDNx;

1.9
date	2013.05.31.01.50.25;	author mrg;	state Exp;
branches;
next	1.8;
commitid	723NkfLYN1tnWIRw;

1.8
date	2010.11.21.02.33.41;	author mrg;	state Exp;
branches
	1.8.6.1
	1.8.12.1;
next	1.7;

1.7
date	2010.11.21.01.25.33;	author mrg;	state Exp;
branches;
next	1.6;

1.6
date	2010.05.24.05.30.40;	author veego;	state Exp;
branches;
next	1.5;

1.5
date	2009.06.18.02.45.30;	author mrg;	state Exp;
branches;
next	1.4;

1.4
date	2009.06.10.08.30.55;	author mrg;	state Exp;
branches;
next	1.3;

1.3
date	2008.11.18.22.31.35;	author hans;	state Exp;
branches;
next	1.2;

1.2
date	2008.10.14.23.37.19;	author cube;	state Exp;
branches
	1.2.2.1
	1.2.4.1;
next	1.1;

1.1
date	2008.07.29.05.01.22;	author mrg;	state Exp;
branches
	1.1.1.1;
next	;

1.13.2.1
date	2018.03.15.09.11.55;	author pgoyette;	state Exp;
branches;
next	;
commitid	lb7w3QtkrVH4axuA;

1.8.6.1
date	2014.05.22.14.09.37;	author yamt;	state Exp;
branches;
next	;
commitid	FFQX08bYGKywAxBx;

1.8.12.1
date	2013.06.23.06.28.41;	author tls;	state Exp;
branches;
next	;
commitid	OnlO1cBgtQRcIHUw;

1.2.2.1
date	2008.10.14.23.37.19;	author haad;	state dead;
branches;
next	1.2.2.2;

1.2.2.2
date	2008.10.19.22.41.01;	author haad;	state Exp;
branches;
next	;

1.2.4.1
date	2008.11.19.03.30.39;	author snj;	state Exp;
branches
	1.2.4.1.4.1;
next	1.2.4.2;

1.2.4.2
date	2009.09.17.04.24.28;	author snj;	state Exp;
branches;
next	;

1.2.4.1.4.1
date	2010.04.21.05.24.33;	author matt;	state Exp;
branches;
next	;

1.1.1.1
date	2008.07.29.05.01.22;	author mrg;	state Exp;
branches
	1.1.1.1.2.1;
next	;

1.1.1.1.2.1
date	2008.07.29.05.01.22;	author wrstuden;	state dead;
branches;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	2008.09.18.05.18.30;	author wrstuden;	state Exp;
branches;
next	;


desc
@@


1.14
log
@fix libXfont2 sources list.  update for xfs 1.2.0.
@
text
@#	$NetBSD: Makefile,v 1.13 2018/03/03 03:34:17 mrg Exp $

.include <bsd.own.mk>

PROG=	xfs

XFSDIR= ${X11SRCDIR.${PROG}}

.PATH:	${XFSDIR}/man

.PATH:	${XFSDIR}/difs
SRCS=	atom.c charinfo.c difsutils.c dispatch.c events.c \
	extensions.c fontinfo.c fonts.c globals.c initfonts.c main.c \
	resource.c swaprep.c swapreq.c tables.c

.PATH:	${XFSDIR}/os
SRCS+=	access.c config.c connection.c daemon.c error.c io.c osglue.c \
	osinit.c utils.c waitfor.c xfstrans.c

CPPFLAGS+=		-I${XFSDIR}/include \
			-I${DESTDIR}${X11INCDIR}/X11/FS \
			-I${XFSDIR}/../include \
			-DHAVE_DAEMON

CONN_DEFINES=		${X11FLAGS.CONNECTION} -DFONT_t -DTRANS_SERVER \
			-DTRANS_REOPEN -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT

XFSCONFIGDIR=		${X11ETCDIR}/fs

CPPFLAGS.initfonts.c=	-DFONT_PCF -DFONT_FS -DFONT_SPEEDO
CPPFLAGS.connection.c=	${CONN_DEFINES} -DBSD44SOCKETS \
			${X11FLAGS.OS_DEFINES}
CPPFLAGS.xfstrans.c=	${CONN_DEFINES} -DBSD44SOCKETS \
			${X11FLAGS.OS_DEFINES}
CPPFLAGS.utils.c=	-DXFSPIDDIR=\"/var/run\"
CPPFLAGS.io.c=		${CONN_DEFINES}
CPPFLAGS.waitfor.c=	${CONN_DEFINES}
CPPFLAGS.error.c=	-DUSE_SYSLOG
CPPFLAGS.osglue.c=	${CONN_DEFINES} \
			${X11FLAGS.OS_DEFINES}
CPPFLAGS.config.c=	${CONN_DEFINES}
# XXX
CPPFLAGS.xfstrans.c+=	-Wno-error

X11EXTRAMANDEFS+=	-e 's%__configfilepath__%${XFSCONFIGDIR}/config%g' \
			-e 's%__configfiledesc__%the default file,%g'


.PATH:	${XFSDIR}/config
BUILDSYMLINKS=	config.cpp fsconfig.cpp
CPPSCRIPTS=	fsconfig
CPPSCRIPTFLAGS=	-DDEFAULTFONTPATH=${X11FONTDIR}/misc/,${X11FONTDIR}/Type1/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/ \
		-DFSERRORS=/var/log/xfs.log -D__appmansuffix__=1

CONFIGFILES=	fsconfig
FILESNAME=	config
FILESDIR=	${XFSCONFIGDIR}


LDADD+=	-lXfont2 -lfontenc -lXext -lX11 -lfreetype -lm -lz
DPADD+=	${LIBXFONT} ${LIBFONTENC} ${LIBXEXT} ${LIBX11} \
	${LIBFREETYPE} ${LIBM} ${LIBZ}

.PATH:	${XFSDIR}

.include <bsd.x11.mk>
.include <bsd.prog.mk>
@


1.13
log
@xfs and xset don't need libXfontcache.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.12 2015/07/17 17:57:11 mrg Exp $
a21 2
			-I${X11SRCDIR.libXfont}/include \
			-I${X11SRCDIR.libXfont}/bitmap \
d60 1
a60 1
LDADD+=	-lXfont -lfontenc -lXext -lX11 -lfreetype -lm -lz
@


1.13.2.1
log
@Synch with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.14 2018/03/11 10:17:10 mrg Exp $
d22 2
d62 1
a62 1
LDADD+=	-lXfont2 -lfontenc -lXext -lX11 -lfreetype -lm -lz
@


1.12
log
@don't hard code FD_SETSIZE now that the code is fine.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.11 2015/07/17 08:30:33 mrg Exp $
d62 2
a63 2
LDADD+=	-lXfont -lfontenc -lXfontcache -lXext -lX11 -lfreetype -lm -lz
DPADD+=	${LIBXFONT} ${LIBFONTENC} ${LIBXFONTCACHE} ${LIBXEXT} ${LIBX11} \
@


1.11
log
@define FD_SETSIZE=512, to match the new XFD_SETSIZE.  something ends up
including <sys/select.h> before Xpoll.h, and the wrong FD_SETSIZE is
used in our fd_set macros, leading to fail.

XXX:  ugh.  fix me properly.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.10 2014/08/24 18:27:16 apb Exp $
a26 3
# XXX
CPPFLAGS+=		-DFD_SETSIZE=512

@


1.10
log
@Avoid splitting sed programs over multiple lines with
<backslash><newline><indentation>.  Use multiple -e options instead.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.9 2013/05/31 01:50:25 mrg Exp $
d27 3
@


1.9
log
@remove cache.c from SRCS list for xfs 1.1.3
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.8 2010/11/21 02:33:41 mrg Exp $
d47 2
a48 2
X11EXTRAMANDEFS+=	-e 's%__configfilepath__%${XFSCONFIGDIR}/config%g; \
			s%__configfiledesc__%the default file,%g'
@


1.8
log
@various updates for moved man pages or app-defaults.
remove some dated CPPFLAGS defines.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2010/11/21 01:25:33 mrg Exp $
d12 1
a12 1
SRCS=	atom.c cache.c charinfo.c difsutils.c dispatch.c events.c \
@


1.8.6.1
log
@sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.8 2010/11/21 02:33:41 mrg Exp $
d12 1
a12 1
SRCS=	atom.c charinfo.c difsutils.c dispatch.c events.c \
@


1.8.12.1
log
@resync from head
@
text
@d1 1
a1 1
#	$NetBSD$
d12 1
a12 1
SRCS=	atom.c charinfo.c difsutils.c dispatch.c events.c \
@


1.7
log
@various updates for moved man pages or app-defaults.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.6 2010/05/24 05:30:40 veego Exp $
d24 2
a25 1
			-I${XFSDIR}/../include
@


1.6
log
@Replace __appmansuffix__ in fsconfig.cpp
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2009/06/18 02:45:30 mrg Exp $
d9 2
d50 1
@


1.5
log
@remove non-existant subdirs from the default path list.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2009/06/10 08:30:55 mrg Exp $
d51 1
a51 1
		-DFSERRORS=/var/log/xfs.log
@


1.4
log
@dno't define FONTCACHE anymore.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2008/11/18 22:31:35 hans Exp $
d50 1
a50 1
CPPSCRIPTFLAGS=	-DDEFAULTFONTPATH=${X11FONTDIR}/misc/,${X11FONTDIR}/Speedo/,${X11FONTDIR}/Type1/,${X11FONTDIR}/CID/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/ \
@


1.3
log
@remove unused definition of DEFAULT_CONFIG_FILE. OK by cube.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2008/10/14 23:37:19 cube Exp $
d29 1
a29 1
CPPFLAGS.initfonts.c=	-DFONT_PCF -DFONT_FS -DFONT_SPEEDO -DFONTCACHE
d40 1
a40 1
CPPFLAGS.config.c=	${CONN_DEFINES} -DFONTCACHE
@


1.2
log
@- Adapt to changes on bsd.x11.mk
- Remove unnecessary targets that handled .man.pre files
- Add transformations for package-specific patterns in man page templates.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
a28 1
CPPFLAGS.main.c=	-DDEFAULT_CONFIG_FILE=\"${XFSCONFIGDIR}/config\"
@


1.2.4.1
log
@Pull up following revision(s) (requested by hans in ticket #88):
	external/mit/xorg/bin/xfs/Makefile: revision 1.3
remove unused definition of DEFAULT_CONFIG_FILE. OK by cube.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2008/10/14 23:37:19 cube Exp $
d29 1
@


1.2.4.1.4.1
log
@sync to netbsd-5
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2.4.2 2009/09/17 04:24:28 snj Exp $
d29 1
a29 1
CPPFLAGS.initfonts.c=	-DFONT_PCF -DFONT_FS -DFONT_SPEEDO
d40 1
a40 1
CPPFLAGS.config.c=	${CONN_DEFINES}
d50 1
a50 1
CPPSCRIPTFLAGS=	-DDEFAULTFONTPATH=${X11FONTDIR}/misc/,${X11FONTDIR}/Type1/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/ \
@


1.2.4.2
log
@Apply patch (requested by mrg in ticket #958):
Sync X.Org reachover build framework and setlists with the new X.Org.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2009/06/18 02:45:30 mrg Exp $
d29 1
a29 1
CPPFLAGS.initfonts.c=	-DFONT_PCF -DFONT_FS -DFONT_SPEEDO
d40 1
a40 1
CPPFLAGS.config.c=	${CONN_DEFINES}
d50 1
a50 1
CPPSCRIPTFLAGS=	-DDEFAULTFONTPATH=${X11FONTDIR}/misc/,${X11FONTDIR}/Type1/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/ \
@


1.2.2.1
log
@file Makefile was added on branch haad-dm on 2008-10-19 22:41:01 +0000
@
text
@d1 66
@


1.2.2.2
log
@Sync with HEAD.
@
text
@a0 66
#	$NetBSD: Makefile,v 1.2 2008/10/14 23:37:19 cube Exp $

.include <bsd.own.mk>

PROG=	xfs

XFSDIR= ${X11SRCDIR.${PROG}}

.PATH:	${XFSDIR}/difs
SRCS=	atom.c cache.c charinfo.c difsutils.c dispatch.c events.c \
	extensions.c fontinfo.c fonts.c globals.c initfonts.c main.c \
	resource.c swaprep.c swapreq.c tables.c

.PATH:	${XFSDIR}/os
SRCS+=	access.c config.c connection.c daemon.c error.c io.c osglue.c \
	osinit.c utils.c waitfor.c xfstrans.c

CPPFLAGS+=		-I${XFSDIR}/include \
			-I${DESTDIR}${X11INCDIR}/X11/FS \
			-I${X11SRCDIR.libXfont}/include \
			-I${X11SRCDIR.libXfont}/bitmap \
			-I${XFSDIR}/../include

CONN_DEFINES=		${X11FLAGS.CONNECTION} -DFONT_t -DTRANS_SERVER \
			-DTRANS_REOPEN -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT

XFSCONFIGDIR=		${X11ETCDIR}/fs

CPPFLAGS.main.c=	-DDEFAULT_CONFIG_FILE=\"${XFSCONFIGDIR}/config\"
CPPFLAGS.initfonts.c=	-DFONT_PCF -DFONT_FS -DFONT_SPEEDO -DFONTCACHE
CPPFLAGS.connection.c=	${CONN_DEFINES} -DBSD44SOCKETS \
			${X11FLAGS.OS_DEFINES}
CPPFLAGS.xfstrans.c=	${CONN_DEFINES} -DBSD44SOCKETS \
			${X11FLAGS.OS_DEFINES}
CPPFLAGS.utils.c=	-DXFSPIDDIR=\"/var/run\"
CPPFLAGS.io.c=		${CONN_DEFINES}
CPPFLAGS.waitfor.c=	${CONN_DEFINES}
CPPFLAGS.error.c=	-DUSE_SYSLOG
CPPFLAGS.osglue.c=	${CONN_DEFINES} \
			${X11FLAGS.OS_DEFINES}
CPPFLAGS.config.c=	${CONN_DEFINES} -DFONTCACHE
# XXX
CPPFLAGS.xfstrans.c+=	-Wno-error

X11EXTRAMANDEFS+=	-e 's%__configfilepath__%${XFSCONFIGDIR}/config%g; \
			s%__configfiledesc__%the default file,%g'


BUILDSYMLINKS=	config.cpp fsconfig.cpp
CPPSCRIPTS=	fsconfig
CPPSCRIPTFLAGS=	-DDEFAULTFONTPATH=${X11FONTDIR}/misc/,${X11FONTDIR}/Speedo/,${X11FONTDIR}/Type1/,${X11FONTDIR}/CID/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/ \
		-DFSERRORS=/var/log/xfs.log

CONFIGFILES=	fsconfig
FILESNAME=	config
FILESDIR=	${XFSCONFIGDIR}


LDADD+=	-lXfont -lfontenc -lXfontcache -lXext -lX11 -lfreetype -lm -lz
DPADD+=	${LIBXFONT} ${LIBFONTENC} ${LIBXFONTCACHE} ${LIBXEXT} ${LIBX11} \
	${LIBFREETYPE} ${LIBM} ${LIBZ}

.PATH:	${XFSDIR}

.include <bsd.x11.mk>
.include <bsd.prog.mk>
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2004/05/16 10:25:14 lukem Exp $
d45 2
a46 1
X11EXTRAMANDEFS+=	-DDEFAULT_CONFIG_FILE=${XFSCONFIGDIR}/config
@


1.1.1.1
log
@initial import of the crossbuild framework for modular Xorg.  this
is heavily based upon the work rtr@@ did on src/x11, but hacked to
work for modern modular Xorg source split.

the sources will live in xsrc/external/mit/<package>/dist.

documentation on using this will come when the above directories
are fully populated.  there are 192 of them so it may take some time
before that is completed.
@
text
@@


1.1.1.1.2.1
log
@file Makefile was added on branch wrstuden-revivesa on 2008-09-18 05:18:30 +0000
@
text
@d1 65
@


1.1.1.1.2.2
log
@Sync with wrstuden-revivesa-base-2.
@
text
@a0 65
#	$NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $

.include <bsd.own.mk>

PROG=	xfs

XFSDIR= ${X11SRCDIR.${PROG}}

.PATH:	${XFSDIR}/difs
SRCS=	atom.c cache.c charinfo.c difsutils.c dispatch.c events.c \
	extensions.c fontinfo.c fonts.c globals.c initfonts.c main.c \
	resource.c swaprep.c swapreq.c tables.c

.PATH:	${XFSDIR}/os
SRCS+=	access.c config.c connection.c daemon.c error.c io.c osglue.c \
	osinit.c utils.c waitfor.c xfstrans.c

CPPFLAGS+=		-I${XFSDIR}/include \
			-I${DESTDIR}${X11INCDIR}/X11/FS \
			-I${X11SRCDIR.libXfont}/include \
			-I${X11SRCDIR.libXfont}/bitmap \
			-I${XFSDIR}/../include

CONN_DEFINES=		${X11FLAGS.CONNECTION} -DFONT_t -DTRANS_SERVER \
			-DTRANS_REOPEN -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT

XFSCONFIGDIR=		${X11ETCDIR}/fs

CPPFLAGS.main.c=	-DDEFAULT_CONFIG_FILE=\"${XFSCONFIGDIR}/config\"
CPPFLAGS.initfonts.c=	-DFONT_PCF -DFONT_FS -DFONT_SPEEDO -DFONTCACHE
CPPFLAGS.connection.c=	${CONN_DEFINES} -DBSD44SOCKETS \
			${X11FLAGS.OS_DEFINES}
CPPFLAGS.xfstrans.c=	${CONN_DEFINES} -DBSD44SOCKETS \
			${X11FLAGS.OS_DEFINES}
CPPFLAGS.utils.c=	-DXFSPIDDIR=\"/var/run\"
CPPFLAGS.io.c=		${CONN_DEFINES}
CPPFLAGS.waitfor.c=	${CONN_DEFINES}
CPPFLAGS.error.c=	-DUSE_SYSLOG
CPPFLAGS.osglue.c=	${CONN_DEFINES} \
			${X11FLAGS.OS_DEFINES}
CPPFLAGS.config.c=	${CONN_DEFINES} -DFONTCACHE
# XXX
CPPFLAGS.xfstrans.c+=	-Wno-error

X11EXTRAMANDEFS+=	-DDEFAULT_CONFIG_FILE=${XFSCONFIGDIR}/config


BUILDSYMLINKS=	config.cpp fsconfig.cpp
CPPSCRIPTS=	fsconfig
CPPSCRIPTFLAGS=	-DDEFAULTFONTPATH=${X11FONTDIR}/misc/,${X11FONTDIR}/Speedo/,${X11FONTDIR}/Type1/,${X11FONTDIR}/CID/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/ \
		-DFSERRORS=/var/log/xfs.log

CONFIGFILES=	fsconfig
FILESNAME=	config
FILESDIR=	${XFSCONFIGDIR}


LDADD+=	-lXfont -lfontenc -lXfontcache -lXext -lX11 -lfreetype -lm -lz
DPADD+=	${LIBXFONT} ${LIBFONTENC} ${LIBXFONTCACHE} ${LIBXEXT} ${LIBX11} \
	${LIBFREETYPE} ${LIBM} ${LIBZ}

.PATH:	${XFSDIR}

.include <bsd.x11.mk>
.include <bsd.prog.mk>
@