X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=x2p%2FMakefile.SH;h=240725a8058068986080ff49ebcd0cc826531b8a;hb=a1a1bbcd8cc170a7ad89ed19ad69b4d6c036c8ab;hp=5bec7a0058f6452ac95aea9336cef55d496d8669;hpb=8611d51e05a37be8bd2213eb9254ef3d54848e64;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index 5bec7a0..240725a 100755
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -1,4 +1,4 @@
-case $CONFIG in
+case $CONFIGDOTSH in
 '')
 	if test -f config.sh; then TOP=.;
 	elif test -f ../config.sh; then TOP=..;
@@ -36,8 +36,10 @@ BYACC = $byacc
 LDFLAGS = $ldflags
 SMALL = $small
 LARGE = $large $split
-mallocsrc = $mallocsrc
-mallocobj = $mallocobj
+# XXX Perl malloc temporarily unusable (declaration collisions with
+# stdlib.h)
+#mallocsrc = $mallocsrc
+#mallocobj = $mallocobj
 shellflags = $shellflags
 
 libs = $libs
@@ -61,6 +63,12 @@ TRNL = '$trnl'
 
 .SUFFIXES: .c \$(OBJ_EXT)
 
+# this is where the sources are
+src    = $src
+
+# nice makes grok this
+#VPATH = .:$src
+
 !GROK!THIS!
 
 cat >>Makefile <<'!NO!SUBS!'
@@ -83,12 +91,13 @@ pl = find2perl.PL s2p.PL
 plextract = find2perl s2p
 plexe = find2perl.exe s2p.exe
 plc   = find2perl.c s2p.c
+plm   = a2p.loadmap
 
 addedbyconf = $(shextract) $(plextract)
 
-h = EXTERN.h INTERN.h ../config.h ../handy.h hash.h a2p.h str.h util.h
+h = EXTERN.h INTERN.h ../config.h handy.h hash.h a2p.h str.h util.h
 
-c = hash.c $(mallocsrc) str.c util.c walk.c
+c = hash.c str.c util.c walk.c
 
 obj = hash$(OBJ_EXT) $(mallocobj) str$(OBJ_EXT) util$(OBJ_EXT) walk$(OBJ_EXT)
 
@@ -117,6 +126,8 @@ run_byacc:	FORCE
 	rm -f a2p.c
 	mv y.tab.c a2p.c
 
+FORCE:
+
 # We don't want to regenerate a2p.c, but it might appear out-of-date
 # after a patch is applied or a new distribution is made.
 a2p.c: a2p.y
@@ -127,7 +138,7 @@ a2p$(OBJ_EXT): a2p.c a2py.c a2p.h EXTERN.h util.h INTERN.h \
 	$(CCCMD) $(LARGE) a2p.c
 
 clean:
-	rm -f a2p *$(OBJ_EXT) $(plexe) $(plc)
+	rm -f a2p *$(OBJ_EXT) $(plexe) $(plc) $(plm)
 
 realclean: clean
 	rm -f *.orig core $(addedbyconf) all malloc.c
@@ -142,7 +153,7 @@ lint:
 	lint $(lintflags) $(defs) $(c) > a2p.fuzz
 
 depend: $(mallocsrc) ../makedepend
-	sh ../makedepend MAKE=$(MAKE)
+	sh ../makedepend MAKE=$(MAKE) src=$(src)/x2p
 
 clist:
 	echo $(c) | tr ' ' $(TRNL) >.clist