summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-09-27 16:49:23 +0000
committerSascha Schumann <sas@php.net>1999-09-27 16:49:23 +0000
commite846baa14b0a0559e160ba279a8676ed1add2e65 (patch)
tree5c6d449b003b82354c5828c4e3d3aafaa50f410f
parent288c73580b25637d10fbb6c3931eaeeb49603979 (diff)
downloadphp-git-e846baa14b0a0559e160ba279a8676ed1add2e65.tar.gz
* include from $(srcdir)
* use proper target for nsapi
-rw-r--r--Makefile.in2
-rw-r--r--sapi/aolserver/Makefile.inc2
-rw-r--r--sapi/nsapi/Makefile.inc2
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index 992bf7ad3f..fdbbe5677d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -97,7 +97,7 @@ maintainer-clean-depend-recursive:
(cd $$subdir && $(MAKE) $$target) || fail=yes; \
done && test -z "$$fail"
-include sapi/$(PHP_SAPI)/Makefile.inc
+include $(srcdir)/sapi/$(PHP_SAPI)/Makefile.inc
regex/libregex.a:
(cd regex; $(MAKE) lib)
diff --git a/sapi/aolserver/Makefile.inc b/sapi/aolserver/Makefile.inc
index 6c56958bc8..b96cdababf 100644
--- a/sapi/aolserver/Makefile.inc
+++ b/sapi/aolserver/Makefile.inc
@@ -2,5 +2,5 @@
INSTALL_IT=:
-php4_nsapi.so: libmodphp4-so.a
+php4_nsapi.so: all-recursive
g++ $(LDFLAGS) -shared sapi/nsapi/aolserver.o -o $@ libmodphp4-so.a $(LIBS)
diff --git a/sapi/nsapi/Makefile.inc b/sapi/nsapi/Makefile.inc
index 6c56958bc8..b96cdababf 100644
--- a/sapi/nsapi/Makefile.inc
+++ b/sapi/nsapi/Makefile.inc
@@ -2,5 +2,5 @@
INSTALL_IT=:
-php4_nsapi.so: libmodphp4-so.a
+php4_nsapi.so: all-recursive
g++ $(LDFLAGS) -shared sapi/nsapi/aolserver.o -o $@ libmodphp4-so.a $(LIBS)