diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/perl/Makefile | 18 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/Makefile.inc | 7 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/libperl/Makefile | 3 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/library/Makefile.inc | 1 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/miniperl/Makefile | 31 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/pod/Makefile.inc | 1 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/x2p/Makefile.inc | 1 |
7 files changed, 22 insertions, 40 deletions
diff --git a/gnu/usr.bin/perl/Makefile b/gnu/usr.bin/perl/Makefile index fa1f63673d5c5..b53231003c676 100644 --- a/gnu/usr.bin/perl/Makefile +++ b/gnu/usr.bin/perl/Makefile @@ -1,23 +1,7 @@ # $FreeBSD$ -.ifmake !install && !distribute -_MINI= miniperl -.endif - -SUBDIR= libperl ${_MINI} perl suidperl library pod utils x2p BSDPAN +SUBDIR= libperl miniperl perl suidperl library pod utils x2p BSDPAN MAINTAINER=markm@freebsd.org -.BEGIN: -.ifmake depend || all - if [ \! -f ${.OBJDIR}/build-tools ] ; then \ - cd ${.CURDIR}/libperl && ${MAKE} depend && ${MAKE} all ; \ - cd ${.CURDIR}/miniperl && ${MAKE} depend && ${MAKE} all ; \ - touch ${.OBJDIR}/build-tools ; \ - fi -.endif -.ifmake cleandir || clean - @rm -f ${.OBJDIR}/build-tools -.endif - .include <bsd.subdir.mk> diff --git a/gnu/usr.bin/perl/Makefile.inc b/gnu/usr.bin/perl/Makefile.inc index 91e979c4a9aa2..91628f40c9fde 100644 --- a/gnu/usr.bin/perl/Makefile.inc +++ b/gnu/usr.bin/perl/Makefile.inc @@ -2,7 +2,12 @@ PERL5SRC?= ${.CURDIR}/../../../../contrib/perl5 PERL5LIBSRC?= ${.CURDIR}/../libperl -MINIPERL!= echo `PATH=$$PATH:${.OBJDIR}/../miniperl:${.OBJDIR}/../../miniperl which miniperl` + +.if exists(${.OBJDIR}/../miniperl/miniperl) +MINIPERL?= ${.OBJDIR}/../miniperl/miniperl +.else +MINIPERL?= ${.OBJDIR}/../../miniperl/miniperl +.endif BINDIR?= /usr/bin diff --git a/gnu/usr.bin/perl/libperl/Makefile b/gnu/usr.bin/perl/libperl/Makefile index 824ce618278bd..55fb87a96ce78 100644 --- a/gnu/usr.bin/perl/libperl/Makefile +++ b/gnu/usr.bin/perl/libperl/Makefile @@ -19,9 +19,6 @@ NO_PERL_SCRIPT_MAKE= true .include <bsd.lib.mk> -build-tools: cleandepend - cd ${.CURDIR} && ${MAKE} lib${LIB}.a - config.h: links @sh config_h.sh diff --git a/gnu/usr.bin/perl/library/Makefile.inc b/gnu/usr.bin/perl/library/Makefile.inc index b339f00c64fe0..6835a0aadaa5a 100644 --- a/gnu/usr.bin/perl/library/Makefile.inc +++ b/gnu/usr.bin/perl/library/Makefile.inc @@ -2,7 +2,6 @@ PERL5SRC?= ${.CURDIR}/../../../../../contrib/perl5 PERL5LIBSRC?= ${.CURDIR}/../../libperl -MINIPERL= miniperl MODULEDIR?= ${MODULE} diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile index cdc8bc1acf1f2..985696459c1f3 100644 --- a/gnu/usr.bin/perl/miniperl/Makefile +++ b/gnu/usr.bin/perl/miniperl/Makefile @@ -2,20 +2,20 @@ PROG= miniperl NOMAN= true -CFLAGS+=-I${PERL5SRC} -I${.OBJDIR} -DPERL_EXTERNAL_GLOB -SRCS= miniperlmain.c opmini.c config.h +SRCS= miniperlmain.c +SRCS+= perl.c gv.c toke.c perly.c op.c regcomp.c dump.c util.c mg.c \ + hv.c av.c run.c pp_hot.c sv.c pp.c scope.c pp_ctl.c pp_sys.c \ + doop.c doio.c regexec.c utf8.c taint.c universal.c \ + xsutils.c globals.c perlio.c config.h +CFLAGS+=-I${.OBJDIR} -I${PERL5SRC} -DPERL_EXTERNAL_GLOB -DPERL_CORE +DPADD= ${LIBM} ${LIBCRYPT} +LDADD= -lm -lcrypt # Miniperl _must_ be static!! NOSHARED= yes -.if exists(${.OBJDIR}/../libperl/) -MYLIBPERL= ${.OBJDIR}/../libperl/libperl.a -.else -MYLIBPERL= ${.CURDIR}/../libperl/libperl.a -.endif -DPADD= ${MYLIBPERL} ${LIBM} ${LIBCRYPT} -LDADD= ${MYLIBPERL} -lm -lcrypt -build-tools: cleandepend - cd ${.CURDIR} && ${MAKE} ${PROG} +build-tools: depend ${PROG} + +install: NO_PERL_SCRIPT_MAKE= true @@ -23,10 +23,9 @@ NO_PERL_SCRIPT_MAKE= true .PATH: ${PERL5SRC} -opmini.c: op.c - ln -sf ${.OODATE} ${.TARGET} - -config.h: links +config.h: links @sh config_h.sh -CLEANFILES+= opmini.c config.h +.SUFFIXES: + +.SUFFIXES: .o .po .So .s .S .c diff --git a/gnu/usr.bin/perl/pod/Makefile.inc b/gnu/usr.bin/perl/pod/Makefile.inc index e030390837116..1e3cbfe7fc72f 100644 --- a/gnu/usr.bin/perl/pod/Makefile.inc +++ b/gnu/usr.bin/perl/pod/Makefile.inc @@ -4,7 +4,6 @@ PERL5SRC?= ${.CURDIR}/../../../../../contrib/perl5 MINIPERLOPT?= -I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl -MINIPERL= miniperl CLEANFILES+= ${PROG}.1 ${PROG}.PL diff --git a/gnu/usr.bin/perl/x2p/Makefile.inc b/gnu/usr.bin/perl/x2p/Makefile.inc index b7a7fef028d63..7f8371ceb29f4 100644 --- a/gnu/usr.bin/perl/x2p/Makefile.inc +++ b/gnu/usr.bin/perl/x2p/Makefile.inc @@ -5,7 +5,6 @@ PERL5SRC= ${.CURDIR}/../../../../../contrib/perl5 PERL5LIBSRC= ${.CURDIR}/../../libperl MINIPERLOPT?= -I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl -MINIPERL= miniperl LDFLAGS+= -L${.OBJDIR}/../../libperl |