Conflict resolution for 2.7.1 import.
This commit is contained in:
parent
645d83b763
commit
b55390258b
|
@ -1,14 +1,18 @@
|
|||
# $Id: Makefile,v 1.11 1995/01/12 19:11:12 jtc Exp $
|
||||
# $NetBSD: Makefile,v 1.12 1996/03/09 00:19:02 phil Exp $
|
||||
|
||||
SUBDIR= libg++ genclass
|
||||
SUBDIR= libg++ libstdc++ # libio libiostream
|
||||
|
||||
INCLUDEDIRS= iostream libg++ g++-include
|
||||
INCLUDEDIRS= include libg++/src
|
||||
|
||||
beforeinstall:
|
||||
install -d -o ${BINOWN} -g ${BINGRP} -m 755 \
|
||||
${DESTDIR}/usr/include/g++
|
||||
install -d -o ${BINOWN} -g ${BINGRP} -m 755 \
|
||||
${DESTDIR}/usr/include/g++/gen
|
||||
install -d -o ${BINOWN} -g ${BINGRP} -m 755 \
|
||||
${DESTDIR}/usr/include/g++/std
|
||||
install -d -o ${BINOWN} -g ${BINGRP} -m 755 \
|
||||
${DESTDIR}/usr/include/g++/stl
|
||||
@-for i in ${INCLUDEDIRS}; do \
|
||||
echo installing includes from $$i ; \
|
||||
(cd $$i; for j in *.[ih]; do \
|
||||
|
@ -17,11 +21,23 @@ beforeinstall:
|
|||
${DESTDIR}/usr/include/g++/$$j; \
|
||||
done); \
|
||||
done
|
||||
@echo installing includes from g++-include/gen
|
||||
@(cd g++-include/gen ; for j in *.*P; do \
|
||||
@echo installing includes from include/gen
|
||||
@(cd include/gen ; for j in *.*P; do \
|
||||
cmp -s $$j ${DESTDIR}/usr/include/g++/gen/$$j || \
|
||||
install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$j \
|
||||
${DESTDIR}/usr/include/g++/gen/$$j; \
|
||||
done)
|
||||
@echo installing includes from libstdc++/std
|
||||
@(cd libstdc++/std ; for j in *.h; do \
|
||||
cmp -s $$j ${DESTDIR}/usr/libstdc++/g++/std/$$j || \
|
||||
install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$j \
|
||||
${DESTDIR}/usr/libstdc++/g++/std/$$j; \
|
||||
done)
|
||||
@echo installing includes from libstdc++/stl
|
||||
@(cd libstdc++/stl ; for j in *.h; do \
|
||||
cmp -s $$j ${DESTDIR}/usr/libstdc++/g++/stl/$$j || \
|
||||
install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$j \
|
||||
${DESTDIR}/usr/libstdc++/g++/stl/$$j; \
|
||||
done)
|
||||
|
||||
.include <bsd.subdir.mk>
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
libg++ version 2.4
|
||||
This is libg++ 2.7.1 from the Free Software Foundation.
|
||||
|
||||
Complete, unmodified libg++ sources are available from
|
||||
prep.ai.mit.edu and prep's mirrors.
|
||||
|
||||
complete, unmodified libg++ sources are available from prep.ai.mit.edu.
|
||||
|
|
|
@ -1,31 +1,4 @@
|
|||
# $Id: Makefile,v 1.25 1995/10/22 21:04:42 christos Exp $
|
||||
# $NetBSD: Makefile,v 1.26 1996/03/09 00:19:06 phil Exp $
|
||||
SUBDIR = src genclass
|
||||
|
||||
LIB= g++
|
||||
|
||||
SRCS= AllocRing.cc Obstack.cc builtin.cc \
|
||||
regex.cc Regex.cc String.cc Integer.cc Rational.cc Complex.cc Random.cc \
|
||||
BitSet.cc BitString.cc LogNorm.cc SmplHist.cc SmplStat.cc \
|
||||
Normal.cc NegExp.cc Weibull.cc Erlang.cc DiscUnif.cc \
|
||||
Uniform.cc Poisson.cc HypGeom.cc Geom.cc Binomial.cc \
|
||||
RNG.cc ACG.cc MLCG.cc RndInt.cc \
|
||||
Fix.cc Fix16.cc Fix24.cc CursesW.cc GetOpt.cc $(EH_FILES) \
|
||||
new.cc chr.cc dtoa.cc error.cc gcd.cc hash.cc \
|
||||
lg.cc fmtq.cc ioob.cc pow.cc sqrt.cc str.cc timer.cc \
|
||||
math.cc compare.cc SLList.cc DLList.cc \
|
||||
streambuf.C stdstrbufs.C iostream.C stdstreams.C \
|
||||
strstream.C indstream.C PlotFile.C SFile.C fstream.C \
|
||||
parsestream.C stream.C makebuf.C editbuf.C filebuf.C \
|
||||
sgetline.C igetline.C igetsb.C procbuf.C sbufvform.C \
|
||||
sbufvscan.C stdiostream.C floatconv.C outfloat.C iomanip.C
|
||||
|
||||
CXXFLAGS+= -nostdinc++ -I$(.CURDIR)/../g++-include \
|
||||
-I$(.CURDIR)/../iostream
|
||||
CFLAGS+= -I$(.CURDIR)
|
||||
LDADD= ${DESTDIR}/usr/lib/c++rt0.o -lcurses
|
||||
DPADD= ${DESTDIR}/usr/lib/c++rt0.o ${LIBCURSES}
|
||||
NOMAN= noman
|
||||
.PATH: $(.CURDIR)/../iostream
|
||||
LIBCURSES!= printf "xxx:\n\techo \$${LIBCURSES}\n.include <bsd.prog.mk>" |\
|
||||
$(MAKE) -r -s -f - xxx | grep curses
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
.include <bsd.subdir.mk>
|
||||
|
|
Loading…
Reference in New Issue