This commit was generated by cvs2svn to compensate for changes in r13122,

which included commits to RCS files with non-trunk default branches.

2 files changed, 0 insertions, 187 deletions

diff --git a/usr.sbin/xntpd/parse/Makefile.kernel b/usr.sbin/xntpd/parse/Makefile.kernel
deleted file mode 100644
index 4cd0ace..0000000
--- a/usr.sbin/xntpd/parse/Makefile.kernel
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# very simple makefile (SunOS!)
-#
-# Possible defines:
-# DEBUG_PARSE:	include debug code (STREAMS mechanism and parsing)
-# DEBUG_CD:	include signal propagation to sun4c LED (sun4c only)
-#
-# Possible defines (parsestreams variants only):
-# KERNEL:	must define
-# VDDRV:	loadable driver support - recommended
-# KARCH:	must define at make call for correct kernel module
-#               (currently only needed for parsestreams variants)
-#
-KARCH=
-DEFS=-DSTREAM -DKERNEL -DVDDRV -D$(KARCH)
-MICROTIME=../ppsclock/sys/$(KARCH)/microtime.s
-
-all:
-	@if [ -f /kernel/unix ]; then \
-	  $(MAKE) $(MFLAGS) MFLAGS="$(MFLAGS)" KARCH="`(arch -k) 2>/dev/null || uname -a | awk '{ print $5 }'`" -f Makefile.kernel parse; \
-	 else \
-	  $(MAKE) $(MFLAGS) MFLAGS="$(MFLAGS)" KARCH="`(arch -k) 2>/dev/null || uname -a | awk '{ print $5 }'`" -f Makefile.kernel parsestreams.o; \
-	 fi
-
-parse: parsesolaris.c libparse_kernel.a ../lib/libntp.a
-	@echo "--- WARNING: SunOS5 support is fresh and hardly tested"
-	@echo "---          This code could lead to kernel panics more"
-	@echo "---          easily than other streams modules"
-	$(CC) -c -I../include -D_KERNEL parsesolaris.c
-	ld -r -o parse parsesolaris.o libparse_kernel.a ../lib/libntp.a
-	@echo "--- Install 'parse' in /kernel/strmod for automatic loading"
-
-mparsestreams.o: mparsestreams.$(KARCH).o
-	@echo "--- You may load mparsestreams.$(KARCH).o via 'modload mparsestreams.$(KARCH).o' into the kernel"
-
-mparsestreams.$(KARCH).o: parsestreams.c microtime.o ../lib/libntp.a libparse_kernel.a ../include/parse.h ../include/sys/parsestreams.h
-	cc -c -DMICROTIME $(DEFS) -I../include parsestreams.c
-	ld -r -o $@ parsestreams.o ../lib/libntp.a libparse_kernel.a \
-		    microtime.o
-	rm -f parsestreams.o
-
-parsestreams.o: parsestreams.$(KARCH).o
-	@echo "--- You may load parsestreams.$(KARCH).o via 'modload parsestreams.o' (put in e.g. /sys/<karch>/OBJ) into the kernel"
-
-parsestreams.$(KARCH).o: parsestreams.c ../lib/libntp.a libparse_kernel.a ../include/parse.h ../include/sys/parsestreams.h
-	cc -c $(DEFS) -I../include parsestreams.c
-	ld -r -o $@ parsestreams.o ../lib/libntp.a libparse_kernel.a
-	rm -f parsestreams.o
-
-microtime.o: $(MICROTIME) assym.s
-	cc -E -I. $(MICROTIME) | sed -e '/\.global _uniqtime/d' > $@.i
-	as -o $@ $@.i
-	rm -f $@.i assym.s
-
-assym.s: genassym
-	./genassym > $@
-
-genassym: ../ppsclock/sys/genassym/genassym.c
-	cc -o $@ $?
-
-libparse_kernel.a:
-	$(MAKE) $(MFLAGS) MFLAGS="$(MFLAGS)" libparse_kernel.a
-
-../lib/libntp.a:
-	cd ../lib && $(MAKE) $(MFLAGS) MFLAGS="$(MFLAGS)"
-
-lint: parsestreams.c ../include/parse.h ../include/sys/parsestreams.h ../lib/llib-llibntp.ln
-	lint -u -I../include $(DEFS) parsestreams.c ../lib/llib-llibntp.ln
-
-../lib/llib-llibntp.ln:
-	cd ../lib && make lintlib
-
-clean:
-	rm -f *.o genassym assym.s parsestreams
-
-distclean: clean
diff --git a/usr.sbin/xntpd/parse/Makefile.tmpl b/usr.sbin/xntpd/parse/Makefile.tmpl
deleted file mode 100644
index 781fed6..0000000
--- a/usr.sbin/xntpd/parse/Makefile.tmpl
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# /src/NTP/REPOSITORY/v3/parse/Makefile.tmpl,v 3.6 1993/10/10 22:44:36 kardel Exp
-#
-LIBNAME=	libparse
-KLIBNAME=	libparse_kernel
-#
-# parse routine that could be used in two places
-#
-COMPILER= cc
-COPTS= -O
-AUTHDEFS=-DDES
-LIBDEFS= -DBIG_ENDIAN
-RANLIB=		ranlib
-INSTALL= install
-CLOCKDEFS=
-DEFS=
-DEFS_OPT=
-DEFS_LOCAL=
-#
-INCL=-I../include
-CFLAGS=	$(COPTS) $(DEFS) $(DEFS_LOCAL) $(INCL)
-CC=		$(COMPILER)
-#
-SOURCE=	parse.c parse_conf.c clk_meinberg.c clk_schmid.c clk_rawdcf.c \
-	clk_dcf7000.c clk_trimtaip.c clk_trimtsip.c
-
-OBJS=	parse.o parse_conf.o clk_meinberg.o clk_schmid.o clk_rawdcf.o \
-	clk_dcf7000.o clk_trimtaip.o clk_trimtsip.o
-
-all:
-	@echo $(DEFS) $(DEFS_LOCAL) $(CLOCKDEFS) | \
-		awk '/-DREFCLOCK/ && /-DPARSE/ && /-DCLOCK_/ { makeit=1; }\
-			END { if (makeit) \
-				{ print "echo ; echo --- creating parse libraries ; $(MAKE) $(MFLAGS) MFLAGS=\"$(MFLAGS)\" MAKE=\"$(MAKE)\" libs"; } \
-				else \
-				{ print "echo ; echo --- creating parse placebo libraries ; $(MAKE) $(MFLAGS) MFLAGS=\"$(MFLAGS)\" MAKE=\"$(MAKE)\" emptyplacebolibs";} }' |\
-			sh 
-	@echo $(DEFS) $(DEFS_LOCAL) $(CLOCKDEFS) | \
-		awk '/-DREFCLOCK/ && /-DPARSE/ && /-DCLOCK_/ {makeit=1; }\
-			END { if (makeit) \
-				{ print "echo ; echo --- creating utility programs ; cd util && $(MAKE) $(MFLAGS) MFLAGS=\"$(MFLAGS)\" MAKE=\"$(MAKE)\" -k"; } \
-				else \
-				{ print ":";} }' |\
-			sh
-	@if (sun) > /dev/null 2>&1; then \
-	   echo $(DEFS) $(DEFS_LOCAL) $(CLOCKDEFS); \
-	 else :; fi | \
-		awk '/-DSTREAM/ && /-DREFCLOCK/ && /-DPARSE/ && /-DCLOCK_/ { makeit=1; }\
-			END { if (makeit) \
-				{ print "echo ; echo --- creating kernel files ; $(MAKE) $(MFLAGS) MFLAGS=\"$(MFLAGS)\" MAKE=\"$(MAKE)\" -f Makefile.kernel"; } \
-				else \
-				{ print ":";} }' |\
-			sh
-
-emptyplacebolibs: empty.c
-	@if [ ! -f "$(LIBNAME).a" -o ! -f "$(KLIBNAME).a" ]; then \
-	  $(CC) -c empty.c; \
-	  rm -f $(LIBNAME).a $(KLIBNAME).a; \
-	  ar r $(LIBNAME).a empty.o; \
-	  $(RANLIB) $(LIBNAME).a; \
-	  ar r $(KLIBNAME).a empty.o; \
-	  $(RANLIB) $(KLIBNAME).a; \
-	  rm -f empty.o; \
-	 else \
-	  : sorry guys - but i always get bitten by the broken ultrix sh; \
-	 fi
-
-libs: $(LIBNAME).a $(KLIBNAME).a
-
-$(LIBNAME).a:	$(SOURCE)
-	$(CC) -c $(CFLAGS) $(CLOCKDEFS) -UPARSESTREAM $(SOURCE)
-	ar rv $@ $(OBJS)
-	rm -f $(OBJS)
-	$(RANLIB) $@
-
-$(KLIBNAME).a:	$(SOURCE) $(LIBNAME).a
-	$(CC) -c $(CFLAGS) $(CLOCKDEFS) -DPARSESTREAM $(SOURCE)
-	ar rv $@ $(OBJS)
-	rm -f $(OBJS)
-	$(RANLIB) $@
-
-lintlib:	llib-l$(LIBNAME).ln
-
-llib-l$(LIBNAME).ln:	$(SOURCE)
-	lint -C$(LIBNAME) $(INCL) $(CLOCKDEFS) $(AUTHDEFS) $(LIBDEFS) $(SOURCE) >lintlib.errs
-
-lint:
-	lint -u $(DEFS) $(INCL) $(CLOCKDEFS) $(AUTHDEFS) $(LIBDEFS) $(SOURCE) >lint.errs
-
-depend:
-	mkdep $(CFLAGS) $(SOURCE)
-
-clean:
-	-@rm -f $(LIBNAME).a $(KLIBNAME).a *.o *.out *.ln make.log Makefile.bak \
-		lintlib.errs lint.errs genassym assym.s parsestreams parse parsestreams.o.*
-	-@cd util && $(MAKE) $(MFLAGS) MFLAGS="$(MFLAGS)" -f Makefile.tmpl clean
-
-distclean:	clean
-	-@rm -f *.orig *.rej .version Makefile
-	-@cd util && $(MAKE) $(MFLAGS) MFLAGS="$(MFLAGS)" -f Makefile.tmpl distclean
-
-install: all
-	@echo $(DEFS) $(DEFS_LOCAL) $(CLOCKDEFS) | \
-		awk '/-DREFCLOCK/ && /-DPARSE/ && /-DCLOCK_/ { makeit=1; }\
-			END { if (makeit) \
-				{ print "echo --- installing utility programs ; cd util && $(MAKE) MAKE=\"$(MAKE)\" $@"; } \
-				else \
-				{ print ":";} }' |\
-			sh
-	@echo "--- Kernel modules like "parse" or "parsestreams.o" must be installed manually"
-	@echo "--- if applicable."