summaryrefslogtreecommitdiff
path: root/php/test
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-09-11 17:38:07 +0200
committerJose <jose@zeroc.com>2014-09-11 17:38:07 +0200
commitc23959aa7a6bb1f81f1834fd68aed48962fd6e2e (patch)
treea1d14ec52574508a3e9e3492462c3a845e0912e7 /php/test
parentFix dependencies causing C++ rebuilds (diff)
downloadice-c23959aa7a6bb1f81f1834fd68aed48962fd6e2e.tar.bz2
ice-c23959aa7a6bb1f81f1834fd68aed48962fd6e2e.tar.xz
ice-c23959aa7a6bb1f81f1834fd68aed48962fd6e2e.zip
Revert "Fixed (ICE-3792) - dependencies in the repository are very crappy"
This reverts commit 201d395c7186e50d195672db7b472989783826cb. Conflicts: cpp/config/Make.rules cpp/test/Ice/Makefile.mak
Diffstat (limited to 'php/test')
-rw-r--r--php/test/Ice/acm/.depend1
-rw-r--r--php/test/Ice/acm/.depend.mak1
-rw-r--r--php/test/Ice/acm/Makefile14
-rw-r--r--php/test/Ice/acm/Makefile.mak14
-rw-r--r--php/test/Ice/binding/.depend1
-rw-r--r--php/test/Ice/binding/.depend.mak1
-rw-r--r--php/test/Ice/binding/Makefile14
-rw-r--r--php/test/Ice/binding/Makefile.mak14
-rw-r--r--php/test/Ice/checksum/.depend2
-rw-r--r--php/test/Ice/checksum/.depend.mak2
-rw-r--r--php/test/Ice/checksum/Makefile16
-rw-r--r--php/test/Ice/checksum/Makefile.mak14
-rw-r--r--php/test/Ice/defaultValue/.depend1
-rw-r--r--php/test/Ice/defaultValue/.depend.mak1
-rw-r--r--php/test/Ice/defaultValue/Makefile14
-rw-r--r--php/test/Ice/defaultValue/Makefile.mak14
-rw-r--r--php/test/Ice/enums/.depend1
-rw-r--r--php/test/Ice/enums/.depend.mak1
-rw-r--r--php/test/Ice/enums/Makefile14
-rw-r--r--php/test/Ice/enums/Makefile.mak14
-rw-r--r--php/test/Ice/exceptions/.depend1
-rw-r--r--php/test/Ice/exceptions/.depend.mak1
-rw-r--r--php/test/Ice/exceptions/Makefile14
-rw-r--r--php/test/Ice/exceptions/Makefile.mak14
-rw-r--r--php/test/Ice/facets/.depend1
-rw-r--r--php/test/Ice/facets/.depend.mak1
-rw-r--r--php/test/Ice/facets/Makefile14
-rw-r--r--php/test/Ice/facets/Makefile.mak14
-rw-r--r--php/test/Ice/info/.depend1
-rw-r--r--php/test/Ice/info/.depend.mak1
-rw-r--r--php/test/Ice/info/Makefile14
-rw-r--r--php/test/Ice/info/Makefile.mak14
-rw-r--r--php/test/Ice/inheritance/.depend1
-rw-r--r--php/test/Ice/inheritance/.depend.mak1
-rw-r--r--php/test/Ice/inheritance/Makefile14
-rw-r--r--php/test/Ice/inheritance/Makefile.mak14
-rw-r--r--php/test/Ice/objects/.depend1
-rw-r--r--php/test/Ice/objects/.depend.mak1
-rw-r--r--php/test/Ice/objects/Makefile14
-rw-r--r--php/test/Ice/objects/Makefile.mak14
-rw-r--r--php/test/Ice/operations/.depend1
-rw-r--r--php/test/Ice/operations/.depend.mak1
-rw-r--r--php/test/Ice/operations/Makefile14
-rw-r--r--php/test/Ice/operations/Makefile.mak14
-rw-r--r--php/test/Ice/optional/.depend2
-rw-r--r--php/test/Ice/optional/.depend.mak2
-rw-r--r--php/test/Ice/optional/Makefile17
-rw-r--r--php/test/Ice/optional/Makefile.mak15
-rw-r--r--php/test/Ice/proxy/.depend1
-rw-r--r--php/test/Ice/proxy/.depend.mak1
-rw-r--r--php/test/Ice/proxy/Makefile14
-rw-r--r--php/test/Ice/proxy/Makefile.mak14
-rw-r--r--php/test/Ice/slicing/exceptions/.depend1
-rw-r--r--php/test/Ice/slicing/exceptions/.depend.mak1
-rw-r--r--php/test/Ice/slicing/exceptions/Makefile14
-rw-r--r--php/test/Ice/slicing/exceptions/Makefile.mak14
-rw-r--r--php/test/Ice/slicing/objects/.depend1
-rw-r--r--php/test/Ice/slicing/objects/.depend.mak1
-rw-r--r--php/test/Ice/slicing/objects/Makefile14
-rw-r--r--php/test/Ice/slicing/objects/Makefile.mak15
-rw-r--r--php/test/Slice/keyword/.depend1
-rw-r--r--php/test/Slice/keyword/.depend.mak1
-rw-r--r--php/test/Slice/keyword/Makefile17
-rw-r--r--php/test/Slice/keyword/Makefile.mak16
-rw-r--r--php/test/Slice/macros/.depend1
-rw-r--r--php/test/Slice/macros/.depend.mak1
-rw-r--r--php/test/Slice/macros/Makefile14
-rw-r--r--php/test/Slice/macros/Makefile.mak14
-rw-r--r--php/test/Slice/structure/.depend1
-rw-r--r--php/test/Slice/structure/.depend.mak1
-rw-r--r--php/test/Slice/structure/Makefile14
-rw-r--r--php/test/Slice/structure/Makefile.mak14
72 files changed, 493 insertions, 63 deletions
diff --git a/php/test/Ice/acm/.depend b/php/test/Ice/acm/.depend
new file mode 100644
index 00000000000..f6d6205e60d
--- /dev/null
+++ b/php/test/Ice/acm/.depend
@@ -0,0 +1 @@
+Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Ice/acm/.depend.mak b/php/test/Ice/acm/.depend.mak
new file mode 100644
index 00000000000..8751ce66bf8
--- /dev/null
+++ b/php/test/Ice/acm/.depend.mak
@@ -0,0 +1 @@
+Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Ice/acm/Makefile b/php/test/Ice/acm/Makefile
index 3ca781e6202..f8d515d687f 100644
--- a/php/test/Ice/acm/Makefile
+++ b/php/test/Ice/acm/Makefile
@@ -9,6 +9,18 @@
top_srcdir = ../../..
-GEN_SRCS = Test.php
+SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) $(SLICE2PHPFLAGS) $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Ice/acm/Makefile.mak b/php/test/Ice/acm/Makefile.mak
index 429c68995a2..53c8f118100 100644
--- a/php/test/Ice/acm/Makefile.mak
+++ b/php/test/Ice/acm/Makefile.mak
@@ -9,6 +9,16 @@
top_srcdir = ..\..\..
-GEN_SRCS = Test.php
-
!include $(top_srcdir)\config\Make.rules.mak.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak
diff --git a/php/test/Ice/binding/.depend b/php/test/Ice/binding/.depend
new file mode 100644
index 00000000000..f6d6205e60d
--- /dev/null
+++ b/php/test/Ice/binding/.depend
@@ -0,0 +1 @@
+Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Ice/binding/.depend.mak b/php/test/Ice/binding/.depend.mak
new file mode 100644
index 00000000000..8751ce66bf8
--- /dev/null
+++ b/php/test/Ice/binding/.depend.mak
@@ -0,0 +1 @@
+Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Ice/binding/Makefile b/php/test/Ice/binding/Makefile
index 3ca781e6202..f8d515d687f 100644
--- a/php/test/Ice/binding/Makefile
+++ b/php/test/Ice/binding/Makefile
@@ -9,6 +9,18 @@
top_srcdir = ../../..
-GEN_SRCS = Test.php
+SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) $(SLICE2PHPFLAGS) $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Ice/binding/Makefile.mak b/php/test/Ice/binding/Makefile.mak
index 429c68995a2..53c8f118100 100644
--- a/php/test/Ice/binding/Makefile.mak
+++ b/php/test/Ice/binding/Makefile.mak
@@ -9,6 +9,16 @@
top_srcdir = ..\..\..
-GEN_SRCS = Test.php
-
!include $(top_srcdir)\config\Make.rules.mak.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak
diff --git a/php/test/Ice/checksum/.depend b/php/test/Ice/checksum/.depend
new file mode 100644
index 00000000000..28bb2acd43d
--- /dev/null
+++ b/php/test/Ice/checksum/.depend
@@ -0,0 +1,2 @@
+Test.php: Test.ice $(slicedir)/Ice/SliceChecksumDict.ice $(SLICE2PHP) $(SLICEPARSERLIB)
+CTypes.php: CTypes.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Ice/checksum/.depend.mak b/php/test/Ice/checksum/.depend.mak
new file mode 100644
index 00000000000..678784619e4
--- /dev/null
+++ b/php/test/Ice/checksum/.depend.mak
@@ -0,0 +1,2 @@
+Test.php: Test.ice "$(slicedir)/Ice/SliceChecksumDict.ice" "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
+CTypes.php: CTypes.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Ice/checksum/Makefile b/php/test/Ice/checksum/Makefile
index d48e0fccbaf..579bdd446f6 100644
--- a/php/test/Ice/checksum/Makefile
+++ b/php/test/Ice/checksum/Makefile
@@ -9,7 +9,19 @@
top_srcdir = ../../..
-GEN_SRCS = Test.php \
- CTypes.php
+SLICE_SRCS = Test.ice \
+ CTypes.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = Test.php CTypes.php
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) $(SLICE2PHPFLAGS) --checksum $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Ice/checksum/Makefile.mak b/php/test/Ice/checksum/Makefile.mak
index 9e8288827f1..648b5348da8 100644
--- a/php/test/Ice/checksum/Makefile.mak
+++ b/php/test/Ice/checksum/Makefile.mak
@@ -9,8 +9,16 @@
top_srcdir = ..\..\..
-SLICE2PHPFLAGS = --checksum
+!include $(top_srcdir)\config\Make.rules.mak.php
-GEN_SRCS = Test.php CTypes.php
+SRCS = Test.php CTypes.php
-!include $(top_srcdir)\config\Make.rules.mak.php
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) --checksum $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak
diff --git a/php/test/Ice/defaultValue/.depend b/php/test/Ice/defaultValue/.depend
new file mode 100644
index 00000000000..f6d6205e60d
--- /dev/null
+++ b/php/test/Ice/defaultValue/.depend
@@ -0,0 +1 @@
+Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Ice/defaultValue/.depend.mak b/php/test/Ice/defaultValue/.depend.mak
new file mode 100644
index 00000000000..8751ce66bf8
--- /dev/null
+++ b/php/test/Ice/defaultValue/.depend.mak
@@ -0,0 +1 @@
+Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Ice/defaultValue/Makefile b/php/test/Ice/defaultValue/Makefile
index 3ca781e6202..f8d515d687f 100644
--- a/php/test/Ice/defaultValue/Makefile
+++ b/php/test/Ice/defaultValue/Makefile
@@ -9,6 +9,18 @@
top_srcdir = ../../..
-GEN_SRCS = Test.php
+SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) $(SLICE2PHPFLAGS) $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Ice/defaultValue/Makefile.mak b/php/test/Ice/defaultValue/Makefile.mak
index 429c68995a2..53c8f118100 100644
--- a/php/test/Ice/defaultValue/Makefile.mak
+++ b/php/test/Ice/defaultValue/Makefile.mak
@@ -9,6 +9,16 @@
top_srcdir = ..\..\..
-GEN_SRCS = Test.php
-
!include $(top_srcdir)\config\Make.rules.mak.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak
diff --git a/php/test/Ice/enums/.depend b/php/test/Ice/enums/.depend
new file mode 100644
index 00000000000..f6d6205e60d
--- /dev/null
+++ b/php/test/Ice/enums/.depend
@@ -0,0 +1 @@
+Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Ice/enums/.depend.mak b/php/test/Ice/enums/.depend.mak
new file mode 100644
index 00000000000..8751ce66bf8
--- /dev/null
+++ b/php/test/Ice/enums/.depend.mak
@@ -0,0 +1 @@
+Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Ice/enums/Makefile b/php/test/Ice/enums/Makefile
index 3ca781e6202..f8d515d687f 100644
--- a/php/test/Ice/enums/Makefile
+++ b/php/test/Ice/enums/Makefile
@@ -9,6 +9,18 @@
top_srcdir = ../../..
-GEN_SRCS = Test.php
+SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) $(SLICE2PHPFLAGS) $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Ice/enums/Makefile.mak b/php/test/Ice/enums/Makefile.mak
index 429c68995a2..53c8f118100 100644
--- a/php/test/Ice/enums/Makefile.mak
+++ b/php/test/Ice/enums/Makefile.mak
@@ -9,6 +9,16 @@
top_srcdir = ..\..\..
-GEN_SRCS = Test.php
-
!include $(top_srcdir)\config\Make.rules.mak.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak
diff --git a/php/test/Ice/exceptions/.depend b/php/test/Ice/exceptions/.depend
new file mode 100644
index 00000000000..3e91b4b10b8
--- /dev/null
+++ b/php/test/Ice/exceptions/.depend
@@ -0,0 +1 @@
+Test.php: Test.ice $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Ice/exceptions/.depend.mak b/php/test/Ice/exceptions/.depend.mak
new file mode 100644
index 00000000000..51846531441
--- /dev/null
+++ b/php/test/Ice/exceptions/.depend.mak
@@ -0,0 +1 @@
+Test.php: Test.ice "$(slicedir)/Ice/BuiltinSequences.ice" "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Ice/exceptions/Makefile b/php/test/Ice/exceptions/Makefile
index 3ca781e6202..f8d515d687f 100644
--- a/php/test/Ice/exceptions/Makefile
+++ b/php/test/Ice/exceptions/Makefile
@@ -9,6 +9,18 @@
top_srcdir = ../../..
-GEN_SRCS = Test.php
+SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) $(SLICE2PHPFLAGS) $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Ice/exceptions/Makefile.mak b/php/test/Ice/exceptions/Makefile.mak
index 429c68995a2..53c8f118100 100644
--- a/php/test/Ice/exceptions/Makefile.mak
+++ b/php/test/Ice/exceptions/Makefile.mak
@@ -9,6 +9,16 @@
top_srcdir = ..\..\..
-GEN_SRCS = Test.php
-
!include $(top_srcdir)\config\Make.rules.mak.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak
diff --git a/php/test/Ice/facets/.depend b/php/test/Ice/facets/.depend
new file mode 100644
index 00000000000..f6d6205e60d
--- /dev/null
+++ b/php/test/Ice/facets/.depend
@@ -0,0 +1 @@
+Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Ice/facets/.depend.mak b/php/test/Ice/facets/.depend.mak
new file mode 100644
index 00000000000..8751ce66bf8
--- /dev/null
+++ b/php/test/Ice/facets/.depend.mak
@@ -0,0 +1 @@
+Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Ice/facets/Makefile b/php/test/Ice/facets/Makefile
index 3ca781e6202..f8d515d687f 100644
--- a/php/test/Ice/facets/Makefile
+++ b/php/test/Ice/facets/Makefile
@@ -9,6 +9,18 @@
top_srcdir = ../../..
-GEN_SRCS = Test.php
+SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) $(SLICE2PHPFLAGS) $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Ice/facets/Makefile.mak b/php/test/Ice/facets/Makefile.mak
index 429c68995a2..53c8f118100 100644
--- a/php/test/Ice/facets/Makefile.mak
+++ b/php/test/Ice/facets/Makefile.mak
@@ -9,6 +9,16 @@
top_srcdir = ..\..\..
-GEN_SRCS = Test.php
-
!include $(top_srcdir)\config\Make.rules.mak.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak
diff --git a/php/test/Ice/info/.depend b/php/test/Ice/info/.depend
new file mode 100644
index 00000000000..5c9804ba170
--- /dev/null
+++ b/php/test/Ice/info/.depend
@@ -0,0 +1 @@
+Test.php: Test.ice $(slicedir)/Ice/Current.ice $(slicedir)/Ice/ObjectAdapterF.ice $(slicedir)/Ice/ConnectionF.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Version.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Ice/info/.depend.mak b/php/test/Ice/info/.depend.mak
new file mode 100644
index 00000000000..78d91dc331a
--- /dev/null
+++ b/php/test/Ice/info/.depend.mak
@@ -0,0 +1 @@
+Test.php: Test.ice "$(slicedir)/Ice/Current.ice" "$(slicedir)/Ice/ObjectAdapterF.ice" "$(slicedir)/Ice/ConnectionF.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Version.ice" "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Ice/info/Makefile b/php/test/Ice/info/Makefile
index 3ca781e6202..f8d515d687f 100644
--- a/php/test/Ice/info/Makefile
+++ b/php/test/Ice/info/Makefile
@@ -9,6 +9,18 @@
top_srcdir = ../../..
-GEN_SRCS = Test.php
+SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) $(SLICE2PHPFLAGS) $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Ice/info/Makefile.mak b/php/test/Ice/info/Makefile.mak
index 429c68995a2..53c8f118100 100644
--- a/php/test/Ice/info/Makefile.mak
+++ b/php/test/Ice/info/Makefile.mak
@@ -9,6 +9,16 @@
top_srcdir = ..\..\..
-GEN_SRCS = Test.php
-
!include $(top_srcdir)\config\Make.rules.mak.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak
diff --git a/php/test/Ice/inheritance/.depend b/php/test/Ice/inheritance/.depend
new file mode 100644
index 00000000000..f6d6205e60d
--- /dev/null
+++ b/php/test/Ice/inheritance/.depend
@@ -0,0 +1 @@
+Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Ice/inheritance/.depend.mak b/php/test/Ice/inheritance/.depend.mak
new file mode 100644
index 00000000000..8751ce66bf8
--- /dev/null
+++ b/php/test/Ice/inheritance/.depend.mak
@@ -0,0 +1 @@
+Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Ice/inheritance/Makefile b/php/test/Ice/inheritance/Makefile
index 3ca781e6202..f8d515d687f 100644
--- a/php/test/Ice/inheritance/Makefile
+++ b/php/test/Ice/inheritance/Makefile
@@ -9,6 +9,18 @@
top_srcdir = ../../..
-GEN_SRCS = Test.php
+SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) $(SLICE2PHPFLAGS) $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Ice/inheritance/Makefile.mak b/php/test/Ice/inheritance/Makefile.mak
index 429c68995a2..53c8f118100 100644
--- a/php/test/Ice/inheritance/Makefile.mak
+++ b/php/test/Ice/inheritance/Makefile.mak
@@ -9,6 +9,16 @@
top_srcdir = ..\..\..
-GEN_SRCS = Test.php
-
!include $(top_srcdir)\config\Make.rules.mak.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak
diff --git a/php/test/Ice/objects/.depend b/php/test/Ice/objects/.depend
new file mode 100644
index 00000000000..f6d6205e60d
--- /dev/null
+++ b/php/test/Ice/objects/.depend
@@ -0,0 +1 @@
+Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Ice/objects/.depend.mak b/php/test/Ice/objects/.depend.mak
new file mode 100644
index 00000000000..8751ce66bf8
--- /dev/null
+++ b/php/test/Ice/objects/.depend.mak
@@ -0,0 +1 @@
+Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Ice/objects/Makefile b/php/test/Ice/objects/Makefile
index 3ca781e6202..f8d515d687f 100644
--- a/php/test/Ice/objects/Makefile
+++ b/php/test/Ice/objects/Makefile
@@ -9,6 +9,18 @@
top_srcdir = ../../..
-GEN_SRCS = Test.php
+SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) $(SLICE2PHPFLAGS) $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Ice/objects/Makefile.mak b/php/test/Ice/objects/Makefile.mak
index 429c68995a2..53c8f118100 100644
--- a/php/test/Ice/objects/Makefile.mak
+++ b/php/test/Ice/objects/Makefile.mak
@@ -9,6 +9,16 @@
top_srcdir = ..\..\..
-GEN_SRCS = Test.php
-
!include $(top_srcdir)\config\Make.rules.mak.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak
diff --git a/php/test/Ice/operations/.depend b/php/test/Ice/operations/.depend
new file mode 100644
index 00000000000..f6d6205e60d
--- /dev/null
+++ b/php/test/Ice/operations/.depend
@@ -0,0 +1 @@
+Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Ice/operations/.depend.mak b/php/test/Ice/operations/.depend.mak
new file mode 100644
index 00000000000..8751ce66bf8
--- /dev/null
+++ b/php/test/Ice/operations/.depend.mak
@@ -0,0 +1 @@
+Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Ice/operations/Makefile b/php/test/Ice/operations/Makefile
index 3ca781e6202..f8d515d687f 100644
--- a/php/test/Ice/operations/Makefile
+++ b/php/test/Ice/operations/Makefile
@@ -9,6 +9,18 @@
top_srcdir = ../../..
-GEN_SRCS = Test.php
+SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) $(SLICE2PHPFLAGS) $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Ice/operations/Makefile.mak b/php/test/Ice/operations/Makefile.mak
index 429c68995a2..53c8f118100 100644
--- a/php/test/Ice/operations/Makefile.mak
+++ b/php/test/Ice/operations/Makefile.mak
@@ -9,6 +9,16 @@
top_srcdir = ..\..\..
-GEN_SRCS = Test.php
-
!include $(top_srcdir)\config\Make.rules.mak.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak
diff --git a/php/test/Ice/optional/.depend b/php/test/Ice/optional/.depend
new file mode 100644
index 00000000000..ef3f3f858ca
--- /dev/null
+++ b/php/test/Ice/optional/.depend
@@ -0,0 +1,2 @@
+ClientPrivate.php: ClientPrivate.ice ./Test.ice $(SLICE2PHP) $(SLICEPARSERLIB)
+Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Ice/optional/.depend.mak b/php/test/Ice/optional/.depend.mak
new file mode 100644
index 00000000000..c0d82ee1596
--- /dev/null
+++ b/php/test/Ice/optional/.depend.mak
@@ -0,0 +1,2 @@
+ClientPrivate.php: ClientPrivate.ice ./Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
+Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Ice/optional/Makefile b/php/test/Ice/optional/Makefile
index ac832893a9d..72ee2ed2d4a 100644
--- a/php/test/Ice/optional/Makefile
+++ b/php/test/Ice/optional/Makefile
@@ -9,8 +9,19 @@
top_srcdir = ../../..
-GEN_SRCS = ClientPrivate.php Test.php
-
-SLICE2PHPFLAGS = -I.
+SLICE_SRCS = ClientPrivate.ice Test.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = ClientPrivate.php Test.php
+SLICE2PHPFLAGS := -I. $(SLICE2PHPFLAGS)
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) $(SLICE2PHPFLAGS) $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Ice/optional/Makefile.mak b/php/test/Ice/optional/Makefile.mak
index bb93814f598..0d5e1dad2c7 100644
--- a/php/test/Ice/optional/Makefile.mak
+++ b/php/test/Ice/optional/Makefile.mak
@@ -9,8 +9,17 @@
top_srcdir = ..\..\..
-GEN_SRCS = ClientPrivate.php Test.php
+!include $(top_srcdir)\config\Make.rules.mak.php
-SLICE2PHPFLAGS = -I.
+SRCS = ClientPrivate.php Test.php
+SLICE2PHPFLAGS = -I. $(SLICE2PHPFLAGS)
-!include $(top_srcdir)\config\Make.rules.mak.php
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak
diff --git a/php/test/Ice/proxy/.depend b/php/test/Ice/proxy/.depend
new file mode 100644
index 00000000000..f6d6205e60d
--- /dev/null
+++ b/php/test/Ice/proxy/.depend
@@ -0,0 +1 @@
+Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Ice/proxy/.depend.mak b/php/test/Ice/proxy/.depend.mak
new file mode 100644
index 00000000000..8751ce66bf8
--- /dev/null
+++ b/php/test/Ice/proxy/.depend.mak
@@ -0,0 +1 @@
+Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Ice/proxy/Makefile b/php/test/Ice/proxy/Makefile
index 3ca781e6202..f8d515d687f 100644
--- a/php/test/Ice/proxy/Makefile
+++ b/php/test/Ice/proxy/Makefile
@@ -9,6 +9,18 @@
top_srcdir = ../../..
-GEN_SRCS = Test.php
+SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) $(SLICE2PHPFLAGS) $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Ice/proxy/Makefile.mak b/php/test/Ice/proxy/Makefile.mak
index 429c68995a2..53c8f118100 100644
--- a/php/test/Ice/proxy/Makefile.mak
+++ b/php/test/Ice/proxy/Makefile.mak
@@ -9,6 +9,16 @@
top_srcdir = ..\..\..
-GEN_SRCS = Test.php
-
!include $(top_srcdir)\config\Make.rules.mak.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak
diff --git a/php/test/Ice/slicing/exceptions/.depend b/php/test/Ice/slicing/exceptions/.depend
new file mode 100644
index 00000000000..f6d6205e60d
--- /dev/null
+++ b/php/test/Ice/slicing/exceptions/.depend
@@ -0,0 +1 @@
+Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Ice/slicing/exceptions/.depend.mak b/php/test/Ice/slicing/exceptions/.depend.mak
new file mode 100644
index 00000000000..8751ce66bf8
--- /dev/null
+++ b/php/test/Ice/slicing/exceptions/.depend.mak
@@ -0,0 +1 @@
+Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Ice/slicing/exceptions/Makefile b/php/test/Ice/slicing/exceptions/Makefile
index e69c6539f4a..0484f38456c 100644
--- a/php/test/Ice/slicing/exceptions/Makefile
+++ b/php/test/Ice/slicing/exceptions/Makefile
@@ -9,6 +9,18 @@
top_srcdir = ../../../..
-GEN_SRCS = Test.php
+SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) $(SLICE2PHPFLAGS) $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Ice/slicing/exceptions/Makefile.mak b/php/test/Ice/slicing/exceptions/Makefile.mak
index 93c34fc157a..7416e5226c0 100644
--- a/php/test/Ice/slicing/exceptions/Makefile.mak
+++ b/php/test/Ice/slicing/exceptions/Makefile.mak
@@ -9,6 +9,16 @@
top_srcdir = ..\..\..\..
-GEN_SRCS = Test.php
-
!include $(top_srcdir)\config\Make.rules.mak.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak
diff --git a/php/test/Ice/slicing/objects/.depend b/php/test/Ice/slicing/objects/.depend
new file mode 100644
index 00000000000..f6d6205e60d
--- /dev/null
+++ b/php/test/Ice/slicing/objects/.depend
@@ -0,0 +1 @@
+Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Ice/slicing/objects/.depend.mak b/php/test/Ice/slicing/objects/.depend.mak
new file mode 100644
index 00000000000..8751ce66bf8
--- /dev/null
+++ b/php/test/Ice/slicing/objects/.depend.mak
@@ -0,0 +1 @@
+Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Ice/slicing/objects/Makefile b/php/test/Ice/slicing/objects/Makefile
index e69c6539f4a..ffc0c0685f8 100644
--- a/php/test/Ice/slicing/objects/Makefile
+++ b/php/test/Ice/slicing/objects/Makefile
@@ -9,6 +9,18 @@
top_srcdir = ../../../..
-GEN_SRCS = Test.php
+SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = ClientPrivate.php Forward.php Test.php
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) -I. $(SLICE2PHPFLAGS) $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Ice/slicing/objects/Makefile.mak b/php/test/Ice/slicing/objects/Makefile.mak
index c662ab37291..52ff0abeb15 100644
--- a/php/test/Ice/slicing/objects/Makefile.mak
+++ b/php/test/Ice/slicing/objects/Makefile.mak
@@ -9,7 +9,16 @@
top_srcdir = ..\..\..\..
-GEN_SRCS = ClientPrivate.php Forward.php Test.php
-SLICE2PHPFLAGS = -I.
-
!include $(top_srcdir)\config\Make.rules.mak.php
+
+SRCS = ClientPrivate.php Forward.php Test.php
+
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) -I. $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak
diff --git a/php/test/Slice/keyword/.depend b/php/test/Slice/keyword/.depend
new file mode 100644
index 00000000000..e2e02ab730d
--- /dev/null
+++ b/php/test/Slice/keyword/.depend
@@ -0,0 +1 @@
+Key.php: Key.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Slice/keyword/.depend.mak b/php/test/Slice/keyword/.depend.mak
new file mode 100644
index 00000000000..51a68e0ee31
--- /dev/null
+++ b/php/test/Slice/keyword/.depend.mak
@@ -0,0 +1 @@
+Key.php: Key.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Slice/keyword/Makefile b/php/test/Slice/keyword/Makefile
index fe6048958fc..0eb38d159ac 100644
--- a/php/test/Slice/keyword/Makefile
+++ b/php/test/Slice/keyword/Makefile
@@ -9,8 +9,19 @@
top_srcdir = ../../..
-GEN_SRCS = Key.php
-
-SLICE2PHPFLAGS = --underscore
+SLICE_SRCS = Key.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = Key.php
+SLICE2PHPFLAGS := --underscore $(SLICE2PHPFLAGS)
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) $(SLICE2PHPFLAGS) $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Slice/keyword/Makefile.mak b/php/test/Slice/keyword/Makefile.mak
index c8cf67bca7e..e58fe151b7a 100644
--- a/php/test/Slice/keyword/Makefile.mak
+++ b/php/test/Slice/keyword/Makefile.mak
@@ -9,7 +9,17 @@
top_srcdir = ..\..\..
-GEN_SRCS = Key.php
-SLICE2PHPFLAGS = --underscore
-
!include $(top_srcdir)\config\Make.rules.mak.php
+
+SRCS = Key.php
+SLICE2PHPFLAGS = --underscore $(SLICE2PHPFLAGS)
+
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak
diff --git a/php/test/Slice/macros/.depend b/php/test/Slice/macros/.depend
new file mode 100644
index 00000000000..f6d6205e60d
--- /dev/null
+++ b/php/test/Slice/macros/.depend
@@ -0,0 +1 @@
+Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Slice/macros/.depend.mak b/php/test/Slice/macros/.depend.mak
new file mode 100644
index 00000000000..8751ce66bf8
--- /dev/null
+++ b/php/test/Slice/macros/.depend.mak
@@ -0,0 +1 @@
+Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Slice/macros/Makefile b/php/test/Slice/macros/Makefile
index 3ca781e6202..f8d515d687f 100644
--- a/php/test/Slice/macros/Makefile
+++ b/php/test/Slice/macros/Makefile
@@ -9,6 +9,18 @@
top_srcdir = ../../..
-GEN_SRCS = Test.php
+SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) $(SLICE2PHPFLAGS) $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Slice/macros/Makefile.mak b/php/test/Slice/macros/Makefile.mak
index 429c68995a2..53c8f118100 100644
--- a/php/test/Slice/macros/Makefile.mak
+++ b/php/test/Slice/macros/Makefile.mak
@@ -9,6 +9,16 @@
top_srcdir = ..\..\..
-GEN_SRCS = Test.php
-
!include $(top_srcdir)\config\Make.rules.mak.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak
diff --git a/php/test/Slice/structure/.depend b/php/test/Slice/structure/.depend
new file mode 100644
index 00000000000..f6d6205e60d
--- /dev/null
+++ b/php/test/Slice/structure/.depend
@@ -0,0 +1 @@
+Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB)
diff --git a/php/test/Slice/structure/.depend.mak b/php/test/Slice/structure/.depend.mak
new file mode 100644
index 00000000000..8751ce66bf8
--- /dev/null
+++ b/php/test/Slice/structure/.depend.mak
@@ -0,0 +1 @@
+Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)"
diff --git a/php/test/Slice/structure/Makefile b/php/test/Slice/structure/Makefile
index 3ca781e6202..f8d515d687f 100644
--- a/php/test/Slice/structure/Makefile
+++ b/php/test/Slice/structure/Makefile
@@ -9,6 +9,18 @@
top_srcdir = ../../..
-GEN_SRCS = Test.php
+SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+%.php: %.ice
+ $(SLICE2PHP) $(SLICE2PHPFLAGS) $<
+
+clean::
+ rm -f $(SRCS)
+
+include .depend
diff --git a/php/test/Slice/structure/Makefile.mak b/php/test/Slice/structure/Makefile.mak
index 429c68995a2..53c8f118100 100644
--- a/php/test/Slice/structure/Makefile.mak
+++ b/php/test/Slice/structure/Makefile.mak
@@ -9,6 +9,16 @@
top_srcdir = ..\..\..
-GEN_SRCS = Test.php
-
!include $(top_srcdir)\config\Make.rules.mak.php
+
+SRCS = Test.php
+
+all:: $(SRCS)
+
+$(SRCS): $*.ice
+ -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice
+
+clean::
+ del /q $(SRCS)
+
+include .depend.mak