diff options
| author | christos <christos@NetBSD.org> | 1997-07-28 00:46:55 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 1997-07-28 00:46:55 +0000 |
| commit | 3b1ba66d7604abc0837ec2afcf79cdaf600dabe7 (patch) | |
| tree | 9a4a53909fcdfb32ccf44a405724b41168f982c1 | |
| parent | ef80d3f82847afeb5aa5c9494ea734c073c0febb (diff) | |
- Make the yacc .h file generation more sane from Juergen Hannken-Illjes
- PR/3919: Thorsten Frueauf: Add config_local.h to CLEANFILES and remove
it from the repository.
| -rw-r--r-- | usr.sbin/amd/amd/Makefile | 9 | ||||
| -rw-r--r-- | usr.sbin/amd/amd2netbsd | 18 | ||||
| -rw-r--r-- | usr.sbin/amd/fsinfo/Makefile | 9 | ||||
| -rw-r--r-- | usr.sbin/amd/libamu/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/amd/libamu/config_local.h | 18 |
5 files changed, 24 insertions, 34 deletions
diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile index b91e48f40d7..428e9bde17f 100644 --- a/usr.sbin/amd/amd/Makefile +++ b/usr.sbin/amd/amd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1997/07/24 23:16:12 christos Exp $ +# $NetBSD: Makefile,v 1.12 1997/07/28 00:46:57 christos Exp $ PROG= amd SRCS= conf_parse.c conf_tok.c srvr_nfs.c srvr_afs.c sched.c rpc_fwd.c \ @@ -13,8 +13,9 @@ CLEANFILES+=conf_tok.c conf_parse.c conf_parse.h y.tab.h conf_tok.o: conf_parse.h -conf_parse.h: y.tab.h - @rm -f ${.TARGET} - @cp -p ${.ALLSRC} ${.TARGET} +conf_parse.c conf_parse.h: conf_parse.y + ${YACC} -d ${.ALLSRC} + mv y.tab.c conf_parse.c + mv y.tab.h conf_parse.h .include <bsd.prog.mk> diff --git a/usr.sbin/amd/amd2netbsd b/usr.sbin/amd/amd2netbsd index a034c1cf52a..13c3b222198 100644 --- a/usr.sbin/amd/amd2netbsd +++ b/usr.sbin/amd/amd2netbsd @@ -1,6 +1,6 @@ #!/usr/local/bin/perl # -# $NetBSD: amd2netbsd,v 1.1.1.1 1997/07/24 21:20:06 christos Exp $ +# $NetBSD: amd2netbsd,v 1.2 1997/07/28 00:46:55 christos Exp $ # # Perl script to convert a standard distribution directory for am-utils into # a NetBSD source tree. @@ -313,9 +313,10 @@ CLEANFILES+=conf_tok.c conf_parse.c conf_parse.h y.tab.h conf_tok.o: conf_parse.h -conf_parse.h: y.tab.h - @rm -f ${.TARGET} - @cp -p ${.ALLSRC} ${.TARGET} +conf_parse.c conf_parse.h: conf_parse.y + ${YACC} -d ${.ALLSRC} + mv y.tab.c conf_parse.c + mv y.tab.h conf_parse.h .include <bsd.prog.mk> %% file usr.sbin/amd/amq/Makefile @@ -360,9 +361,10 @@ CLEANFILES+=fsi_lex.c fsi_gram.c fsi_gram.h y.tab.h fsi_lex.o: fsi_gram.h -fsi_gram.h: y.tab.h - @rm -f ${.TARGET} - @cp -p ${.ALLSRC} ${.TARGET} +fsi_gram.c fsi_gram.h: fsi_gram.y + ${YACC} -d ${.ALLSRC} + mv y.tab.c fsi_gram.c + mv y.tab.h fsi_gram.h .include <bsd.prog.mk> %% file usr.sbin/amd/libamu/Makefile @@ -375,6 +377,8 @@ config_local.h: mkconf @rm -f ${.TARGET} sh ${.ALLSRC} > ${.TARGET} +CLEANFILES+=config_local.h + .include <bsd.lib.mk> LDADD= DPADD= diff --git a/usr.sbin/amd/fsinfo/Makefile b/usr.sbin/amd/fsinfo/Makefile index a9e5e34e1ce..a52913af171 100644 --- a/usr.sbin/amd/fsinfo/Makefile +++ b/usr.sbin/amd/fsinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1997/07/24 23:18:20 christos Exp $ +# $NetBSD: Makefile,v 1.11 1997/07/28 00:46:59 christos Exp $ PROG= fsinfo SRCS= fsi_gram.c fsi_lex.c wr_fstab.c wr_exportfs.c wr_dumpset.c wr_bparam.c \ @@ -8,8 +8,9 @@ CLEANFILES+=fsi_lex.c fsi_gram.c fsi_gram.h y.tab.h fsi_lex.o: fsi_gram.h -fsi_gram.h: y.tab.h - @rm -f ${.TARGET} - @cp -p ${.ALLSRC} ${.TARGET} +fsi_gram.c fsi_gram.h: fsi_gram.y + ${YACC} -d ${.ALLSRC} + mv y.tab.c fsi_gram.c + mv y.tab.h fsi_gram.h .include <bsd.prog.mk> diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile index 7d3af0748fd..17ecf76717d 100644 --- a/usr.sbin/amd/libamu/Makefile +++ b/usr.sbin/amd/libamu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 1997/07/24 21:20:11 christos Exp $ +# $NetBSD: Makefile,v 1.2 1997/07/28 00:47:01 christos Exp $ LIB= amu SRCS= mtabutil.c tranputil.c umount_fs.c xutil.c xdr_mountres3.c wire.c \ @@ -8,6 +8,8 @@ config_local.h: mkconf @rm -f ${.TARGET} sh ${.ALLSRC} > ${.TARGET} +CLEANFILES+= config_local.h + .include <bsd.lib.mk> LDADD= DPADD= diff --git a/usr.sbin/amd/libamu/config_local.h b/usr.sbin/amd/libamu/config_local.h deleted file mode 100644 index fa233cfe936..00000000000 --- a/usr.sbin/amd/libamu/config_local.h +++ /dev/null @@ -1,18 +0,0 @@ - -/* Define user name */ -#define USER_NAME "christos" - -/* Define configuration date */ -#define CONFIG_DATE "Thu Jul 24 18:30:11 EDT 1997" - -/* Define name of host */ -#define HOST_NAME "borken.nyc.deshaw.com" - -/* Define only version of host machine (eg. 2.5.1) */ -#define HOST_OS_VERSION "1.2G" - -/* Define only name of host machine OS (eg. solaris2) */ -#define HOST_OS_NAME "netbsd1" - -#define HOST_OS "netbsd1.2G" - |
