X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=new%2F_OpenBSD_%2FLin%2FMod%2Fgen-Libc%2FMakefile;h=87f675119f38755b4c239954871722ef15631498;hb=1f41aea4cc610bc8f6b3845a3db18482d3f15688;hp=38d5ba86388ea69015e4acd6eeb4bcab1864264a;hpb=33309b9780f3b368c4e594c76ffd1ab49f1c665a;p=bbcp.git

diff --git a/new/_OpenBSD_/Lin/Mod/gen-Libc/Makefile b/new/_OpenBSD_/Lin/Mod/gen-Libc/Makefile
index 38d5ba8..87f6751 100644
--- a/new/_OpenBSD_/Lin/Mod/gen-Libc/Makefile
+++ b/new/_OpenBSD_/Lin/Mod/gen-Libc/Makefile
@@ -4,64 +4,69 @@
 # ${.ALLSRC}    $^
 # ${.IMPSRC}    $<
 
+INCDIR ?= /usr/include
+
 PY = python2.7
 
-DEFS = defs-errno defs-signal defs-sc defs-madv defs-siginfo defs-siginfo1 defs-sa defs-mman defs-fcntl defs-sig
+DEFS = clockspersec defs-map defs-prot defs-sigmask nsig defs-signo defs-fpe defs-sa defs-errno namemax defs-fcntlo defs-basictypes defs-sc
 
 all: Libc.txt ${DEFS} strerrnocase.txt
 
-Libc.txt: Libc.txt.templ ${DEFS} sizeofs
+Libc.txt: Libc.txt.templ ${DEFS} libver osname machine custom fields-dirent fields-sigaction fields-siginfo fields-stack fields-stat fields-tm fields-ucontext
 	${PY} ./untempl.py Libc.txt.templ ${.TARGET}
-#	perl -pe 's/\n/\r\n/' < ${.TARGET}.tmp > ${.TARGET}
-#	${PY} ./untempl2.py ${.TARGET}.tmp ${.TARGET}
-#	rm -f ${.TARGET}.tmp
 
-sizeofs: sizeofs.c
-	${CC} -O0 -g -o ${.TARGET} ${.ALLSRC}
+clockspersec:
+	grep CLOCKS_PER_SEC ${INCDIR}/time.h | head -1 | awk '{print $$3}' | tr -d '\n' > ${.TARGET}
 
-defs-errno:
-	./dumpdefs.py 2 0 i /usr/include/sys/errno.h > ${.TARGET}
-	./dumpdefs.py 2 1 i /usr/include/sys/errno.h >> ${.TARGET}
+defs-map:
+	./dumpdefs.py 2 0 s ${INCDIR}/sys/mman.h | grep "	MAP_" > ${.TARGET}
+
+defs-prot:
+	./dumpdefs.py 2 0 s ${INCDIR}/sys/mman.h | grep "	PROT_" > ${.TARGET}
+
+defs-sigmask:
+	./dumpdefs.py 2 2 i ${INCDIR}/sys/signal.h | grep "	SIG_" > ${.TARGET}
 
-defs-tftp:
-	./dumpdefs.py 2 1 i /usr/include/arpa/tftp.h | grep EACCESS > ${.TARGET}
+defs-signo:
+	./dumpdefs.py 2 1 i ${INCDIR}/sys/signal.h | grep "	SIG" > ${.TARGET}
+	./dumpdefs.py 2 2 i ${INCDIR}/sys/signal.h | grep SIGWINCH >> ${.TARGET}
+	./dumpdefs.py 2 2 i ${INCDIR}/sys/signal.h | grep SIGTHR >> ${.TARGET}
 
-defs-signal:
-	./dumpdefs.py 2 1 i /usr/include/sys/signal.h > ${.TARGET}
-	./dumpdefs.py 2 2 i /usr/include/sys/signal.h | grep SIGWINCH >> ${.TARGET}
-	./dumpdefs.py 2 2 i /usr/include/sys/signal.h | grep SIGTHR >> ${.TARGET}
+nsig:
+	grep "#define _NSIG" ${INCDIR}/sys/signal.h | head -1 | awk '{print $$3}' | tr -d '\n' > ${.TARGET}
 
-defs-sig:
-	./dumpdefs.py 2 2 i /usr/include/sys/signal.h | grep SIG_ > ${.TARGET}
+defs-fpe:
+	./dumpdefs.py 2 2 i ${INCDIR}/sys/siginfo.h | grep "	FPE_" > ${.TARGET}
 
 defs-sa:
-	./dumpdefs.py 2 2 s /usr/include/sys/signal.h | grep "	SA_" > ${.TARGET}
-	./dumpdefs.py 2 3 s /usr/include/sys/signal.h | grep "	SA_" >> ${.TARGET}
+	./dumpdefs.py 2 2 s ${INCDIR}/sys/signal.h | grep "	SA_" > ${.TARGET}
+	./dumpdefs.py 2 3 s ${INCDIR}/sys/signal.h | grep "	SA_" >> ${.TARGET}
 
-defs-mman:
-	./dumpdefs.py 2 0 s /usr/include/sys/mman.h | grep "	PROT_" > ${.TARGET}
-	./dumpdefs.py 2 0 s /usr/include/sys/mman.h | grep "	MAP_" >> ${.TARGET}
+defs-errno:
+	./dumpdefs.py 2 0 i ${INCDIR}/sys/errno.h > ${.TARGET}
+	./dumpdefs.py 2 1 i ${INCDIR}/sys/errno.h >> ${.TARGET}
 
-defs-fcntl:
-	./dumpdefs.py 2 2 s /usr/include/fcntl.h | grep -v compat | grep "	O_" > ${.TARGET}
-	./dumpdefs.py 2 1 s /usr/include/fcntl.h | grep "	O_" >> ${.TARGET}
+namemax:
+	grep "	NAME_MAX	" ${INCDIR}/sys/syslimits.h | head -1 | awk '{print $$3}' | tr -d '\n' > ${.TARGET}
 
-defs-siginfo:
-	./dumpdefs.py 2 1 i /usr/include/sys/siginfo.h > ${.TARGET}
-	./dumpdefs.py 2 2 i /usr/include/sys/siginfo.h >> ${.TARGET}
+defs-fcntlo:
+	./dumpdefs.py 2 2 s ${INCDIR}/fcntl.h | grep -v compat | grep "	O_" > ${.TARGET}
+	./dumpdefs.py 2 1 s ${INCDIR}/fcntl.h | grep "	O_" >> ${.TARGET}
 
-defs-sc:
-	./dumpdefs.py 2 1 i /usr/include/unistd.h | grep _SC_ > ${.TARGET}
+defs-basictypes: sizeofs
+	./sizeofs > ${.TARGET}
 
-defs-madv:
-	./dumpdefs.py 2 0 i /usr/include/sys/mman.h | grep MADV > ${.TARGET}
-	./dumpdefs.py 2 1 i /usr/include/sys/mman.h | grep MADV >> ${.TARGET}
+defs-sc:
+	./dumpdefs.py 2 1 i ${INCDIR}/unistd.h | grep _SC_ > ${.TARGET}
 
-defs-siginfo1:
-	./dumpdefs.py 2 2 i /usr/include/sys/siginfo.h | grep FPE_ > ${.TARGET}
-	./dumpdefs.py 2 2 i /usr/include/sys/siginfo.h | grep ILL_ >> ${.TARGET}
-	./dumpdefs.py 2 2 i /usr/include/sys/siginfo.h | grep SEGV_ >> ${.TARGET}
-	./dumpdefs.py 2 2 i /usr/include/sys/siginfo.h | grep BUS_ >> ${.TARGET}
+#defs-madv:
+#	./dumpdefs.py 2 0 i ${INCDIR}/sys/mman.h | grep MADV > ${.TARGET}
+#	./dumpdefs.py 2 1 i ${INCDIR}/sys/mman.h | grep MADV >> ${.TARGET}
+#
+#defs-siginfo1:
+#	./dumpdefs.py 2 2 i ${INCDIR}/sys/siginfo.h | grep ILL_ >> ${.TARGET}
+#	./dumpdefs.py 2 2 i ${INCDIR}/sys/siginfo.h | grep SEGV_ >> ${.TARGET}
+#	./dumpdefs.py 2 2 i ${INCDIR}/sys/siginfo.h | grep BUS_ >> ${.TARGET}
 
 dumpstrerrno.c: defs-errno
 	grep -v ERESTART ${.ALLSRC} | grep -v EJUSTRETURN | ./mkdumpstrerrno.py > ${.TARGET}
@@ -70,4 +75,4 @@ strerrnocase.txt: dumpstrerrno
 	./dumpstrerrno | ./mkstrerrnocase.py > ${.TARGET}
 
 clean:
-	rm -f sizeofs ${DEFS} Libc.txt dumpstrerrno dumpstrerrno.c strerrnocase.txt
+	rm -f ${DEFS} Libc.txt dumpstrerrno dumpstrerrno.c strerrnocase.txt sizeofs