3 files changed, 22 insertions, 31 deletions
diff --git a/sapi/servlet/Makefile.frag b/sapi/servlet/Makefile.frag
new file mode 100644
index 0000000000..6570d92bde
--- /dev/null
+++ b/sapi/servlet/Makefile.frag
@@ -0,0 +1,19 @@
+
+$(builddir)/java.c : $(srcdir)/../../ext/java/java.c
+	@cp $(srcdir)/../../ext/java/java.c $(builddir)
+
+$(builddir)/phpsrvlt.jar : $(srcdir)/servlet.java $(srcdir)/../../ext/java/reflect.java
+	$(mkinstalldirs) $(builddir)/net/php
+	@echo library=php4 > $(builddir)/net/php/reflect.properties
+	@echo library=php4 > $(builddir)/net/php/servlet.properties
+	@cp $(builddir)/formatter.java $(builddir)/net/php
+	@cp $(builddir)/servlet.java $(builddir)/net/php
+	@cp $(srcdir)/../../ext/java/reflect.java $(builddir)/net/php
+	cd $(builddir) && javac net/php/reflect.java
+	@test ! -f $(builddir)/reflect.class || mv $(builddir)/reflect.class $(builddir)/net/php # bug in KJC javac
+	javac -classpath .:$(SERVLET_CLASSPATH):$(CLASSPATH) $(builddir)/net/php/servlet.java
+	@test ! -f $(builddir)/servlet.class || mv $(builddir)/servlet.class $(builddir)/net/php # bug in KJC javac
+	javac -classpath .:$(SERVLET_CLASSPATH):$(CLASSPATH) $(builddir)/net/php/formatter.java
+	@test ! -f $(builddir)/formatter.class || mv $(builddir)/formatter.class $(builddir)/net/php # bug in KJC javac
+	cd $(builddir)/ && $(JAVA_JAR) phpsrvlt.jar net/php/*.class net/php/*.properties
+	@rm -rf $(builddir)/net
diff --git a/sapi/servlet/Makefile.in b/sapi/servlet/Makefile.in
deleted file mode 100644
index 940866b7fc..0000000000
--- a/sapi/servlet/Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-
-LTLIBRARY_NAME = libsapi.la
-LTLIBRARY_SOURCES = servlet.c java.c
-LTLIBRARY_DEPENDENCIES = phpsrvlt.jar
-
-EXTRA_CFLAGS = $(JAVA_CFLAGS)
-EXTRA_INCLUDES = $(JAVA_INCLUDE)
-
-include $(top_srcdir)/build/ltlib.mk
-
-java.c : ../../ext/java/java.c
-	@cp ../../ext/java/java.c .
-
-phpsrvlt.jar : servlet.java ../../ext/java/reflect.java
-	$(mkinstalldirs) net/php
-	@echo library=php4>net/php/reflect.properties
-	@echo library=php4>net/php/servlet.properties
-	@cp formatter.java net/php
-	@cp servlet.java net/php
-	@cp ../../ext/java/reflect.java net/php
-	javac net/php/reflect.java
-	@test ! -f reflect.class || mv reflect.class net/php # bug in KJC javac
-	javac -classpath .:$(SERVLET_CLASSPATH):$(CLASSPATH) net/php/servlet.java
-	@test ! -f servlet.class || mv servlet.class net/php # bug in KJC javac
-	javac -classpath .:$(SERVLET_CLASSPATH):$(CLASSPATH) net/php/formatter.java
-	@test ! -f formatter.class || mv formatter.class net/php # bug in KJC javac
-	$(JAVA_JAR) phpsrvlt.jar net/php/*.class net/php/*.properties
-	@rm net/php/servlet.* net/php/reflect.* net/php/formatter.*
-	@rmdir net/php
-	@rmdir net
diff --git a/sapi/servlet/config.m4 b/sapi/servlet/config.m4
index 8be5d17199..46219bee00 100644
--- a/sapi/servlet/config.m4
+++ b/sapi/servlet/config.m4
@@ -37,8 +37,10 @@ AC_ARG_WITH(servlet,
     INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/sapi/servlet/phpsrvlt.jar \$(libdir)"
     INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 $SAPI_SHARED \$(libdir)"
     PHP_SAPI=servlet
-    PHP_BUILD_SHARED
     PHP_BUILD_THREAD_SAFE
+    PHP_SELECT_SAPI(servlet, shared, servlet.c)
+    PHP_ADD_SOURCES(/sapi/servlet, java.c,,sapi)
+    PHP_ADD_MAKEFILE_FRAGMENT(sapi/servlet/Makefile.frag)
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)