diff options
| author | Jose <jose@zeroc.com> | 2014-09-24 16:36:41 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-09-24 16:36:41 +0200 |
| commit | 5813f74867a47dca54bf058056443e7b6625f244 (patch) | |
| tree | 28a8996aeeb4a721e8e2eda78388c107549ed61c /php/test | |
| parent | ICE-5689 Test for JavaScript nested modules not implemented in Java/C# (diff) | |
| download | ice-5813f74867a47dca54bf058056443e7b6625f244.tar.bz2 ice-5813f74867a47dca54bf058056443e7b6625f244.tar.xz ice-5813f74867a47dca54bf058056443e7b6625f244.zip | |
Fix (ICE-3792) - dependencies in the repository are very crappy
For now removed Unix dependencies from repository, we keep Windows
dependencies in repository but now are generated from Windows.
Diffstat (limited to 'php/test')
72 files changed, 121 insertions, 474 deletions
diff --git a/php/test/Ice/acm/.depend b/php/test/Ice/acm/.depend deleted file mode 100644 index f6d6205e60d..00000000000 --- a/php/test/Ice/acm/.depend +++ /dev/null @@ -1 +0,0 @@ -Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB) diff --git a/php/test/Ice/acm/.depend.mak b/php/test/Ice/acm/.depend.mak index 8751ce66bf8..4eba865be84 100644 --- a/php/test/Ice/acm/.depend.mak +++ b/php/test/Ice/acm/.depend.mak @@ -1 +1,3 @@ -Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" + +Test.php: \ + Test.ice diff --git a/php/test/Ice/acm/Makefile b/php/test/Ice/acm/Makefile index f8d515d687f..50caec1448b 100644 --- a/php/test/Ice/acm/Makefile +++ b/php/test/Ice/acm/Makefile @@ -12,15 +12,3 @@ top_srcdir = ../../.. 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 53c8f118100..2534a99ee82 100644 --- a/php/test/Ice/acm/Makefile.mak +++ b/php/test/Ice/acm/Makefile.mak @@ -9,16 +9,6 @@ top_srcdir = ..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = Test.php - -all:: $(SRCS) +SLICE_SRCS = Test.ice -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice - -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/binding/.depend b/php/test/Ice/binding/.depend deleted file mode 100644 index f6d6205e60d..00000000000 --- a/php/test/Ice/binding/.depend +++ /dev/null @@ -1 +0,0 @@ -Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB) diff --git a/php/test/Ice/binding/.depend.mak b/php/test/Ice/binding/.depend.mak index 8751ce66bf8..4eba865be84 100644 --- a/php/test/Ice/binding/.depend.mak +++ b/php/test/Ice/binding/.depend.mak @@ -1 +1,3 @@ -Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" + +Test.php: \ + Test.ice diff --git a/php/test/Ice/binding/Makefile b/php/test/Ice/binding/Makefile index f8d515d687f..7ea72b9b2b4 100644 --- a/php/test/Ice/binding/Makefile +++ b/php/test/Ice/binding/Makefile @@ -11,16 +11,6 @@ top_srcdir = ../../.. SLICE_SRCS = Test.ice -include $(top_srcdir)/config/Make.rules.php - -SRCS = Test.php - -all:: $(SRCS) +SLICE2PHPFLAGS = --checksum -%.php: %.ice - $(SLICE2PHP) $(SLICE2PHPFLAGS) $< - -clean:: - rm -f $(SRCS) - -include .depend +include $(top_srcdir)/config/Make.rules.php diff --git a/php/test/Ice/binding/Makefile.mak b/php/test/Ice/binding/Makefile.mak index 53c8f118100..2534a99ee82 100644 --- a/php/test/Ice/binding/Makefile.mak +++ b/php/test/Ice/binding/Makefile.mak @@ -9,16 +9,6 @@ top_srcdir = ..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = Test.php - -all:: $(SRCS) +SLICE_SRCS = Test.ice -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice - -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/checksum/.depend b/php/test/Ice/checksum/.depend deleted file mode 100644 index 28bb2acd43d..00000000000 --- a/php/test/Ice/checksum/.depend +++ /dev/null @@ -1,2 +0,0 @@ -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 index 678784619e4..5fdf516f105 100644 --- a/php/test/Ice/checksum/.depend.mak +++ b/php/test/Ice/checksum/.depend.mak @@ -1,2 +1,7 @@ -Test.php: Test.ice "$(slicedir)/Ice/SliceChecksumDict.ice" "$(SLICE2PHP)" "$(SLICEPARSERLIB)" -CTypes.php: CTypes.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" + +Test.php: \ + Test.ice \ + $(slicedir)/Ice/SliceChecksumDict.ice + +CTypes.php: \ + CTypes.ice diff --git a/php/test/Ice/checksum/Makefile b/php/test/Ice/checksum/Makefile index 579bdd446f6..54e7f279f55 100644 --- a/php/test/Ice/checksum/Makefile +++ b/php/test/Ice/checksum/Makefile @@ -13,15 +13,3 @@ 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 648b5348da8..d4475beaab8 100644 --- a/php/test/Ice/checksum/Makefile.mak +++ b/php/test/Ice/checksum/Makefile.mak @@ -9,16 +9,8 @@ top_srcdir = ..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = Test.php CTypes.php - -all:: $(SRCS) +SLICE2PHPFLAGS = --checksum -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) --checksum $*.ice +SLICE_SRCS = Test.ice CTypes.ice -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/defaultValue/.depend b/php/test/Ice/defaultValue/.depend deleted file mode 100644 index f6d6205e60d..00000000000 --- a/php/test/Ice/defaultValue/.depend +++ /dev/null @@ -1 +0,0 @@ -Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB) diff --git a/php/test/Ice/defaultValue/.depend.mak b/php/test/Ice/defaultValue/.depend.mak index 8751ce66bf8..4eba865be84 100644 --- a/php/test/Ice/defaultValue/.depend.mak +++ b/php/test/Ice/defaultValue/.depend.mak @@ -1 +1,3 @@ -Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" + +Test.php: \ + Test.ice diff --git a/php/test/Ice/defaultValue/Makefile b/php/test/Ice/defaultValue/Makefile index f8d515d687f..50caec1448b 100644 --- a/php/test/Ice/defaultValue/Makefile +++ b/php/test/Ice/defaultValue/Makefile @@ -12,15 +12,3 @@ top_srcdir = ../../.. 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 53c8f118100..2534a99ee82 100644 --- a/php/test/Ice/defaultValue/Makefile.mak +++ b/php/test/Ice/defaultValue/Makefile.mak @@ -9,16 +9,6 @@ top_srcdir = ..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = Test.php - -all:: $(SRCS) +SLICE_SRCS = Test.ice -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice - -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/enums/.depend b/php/test/Ice/enums/.depend deleted file mode 100644 index f6d6205e60d..00000000000 --- a/php/test/Ice/enums/.depend +++ /dev/null @@ -1 +0,0 @@ -Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB) diff --git a/php/test/Ice/enums/.depend.mak b/php/test/Ice/enums/.depend.mak index 8751ce66bf8..4eba865be84 100644 --- a/php/test/Ice/enums/.depend.mak +++ b/php/test/Ice/enums/.depend.mak @@ -1 +1,3 @@ -Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" + +Test.php: \ + Test.ice diff --git a/php/test/Ice/enums/Makefile b/php/test/Ice/enums/Makefile index f8d515d687f..50caec1448b 100644 --- a/php/test/Ice/enums/Makefile +++ b/php/test/Ice/enums/Makefile @@ -12,15 +12,3 @@ top_srcdir = ../../.. 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 53c8f118100..2534a99ee82 100644 --- a/php/test/Ice/enums/Makefile.mak +++ b/php/test/Ice/enums/Makefile.mak @@ -9,16 +9,6 @@ top_srcdir = ..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = Test.php - -all:: $(SRCS) +SLICE_SRCS = Test.ice -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice - -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/exceptions/.depend b/php/test/Ice/exceptions/.depend deleted file mode 100644 index 3e91b4b10b8..00000000000 --- a/php/test/Ice/exceptions/.depend +++ /dev/null @@ -1 +0,0 @@ -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 index 51846531441..870871422fc 100644 --- a/php/test/Ice/exceptions/.depend.mak +++ b/php/test/Ice/exceptions/.depend.mak @@ -1 +1,4 @@ -Test.php: Test.ice "$(slicedir)/Ice/BuiltinSequences.ice" "$(SLICE2PHP)" "$(SLICEPARSERLIB)" + +Test.php: \ + Test.ice \ + $(slicedir)/Ice/BuiltinSequences.ice diff --git a/php/test/Ice/exceptions/Makefile b/php/test/Ice/exceptions/Makefile index f8d515d687f..50caec1448b 100644 --- a/php/test/Ice/exceptions/Makefile +++ b/php/test/Ice/exceptions/Makefile @@ -12,15 +12,3 @@ top_srcdir = ../../.. 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 53c8f118100..2534a99ee82 100644 --- a/php/test/Ice/exceptions/Makefile.mak +++ b/php/test/Ice/exceptions/Makefile.mak @@ -9,16 +9,6 @@ top_srcdir = ..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = Test.php - -all:: $(SRCS) +SLICE_SRCS = Test.ice -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice - -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/facets/.depend b/php/test/Ice/facets/.depend deleted file mode 100644 index f6d6205e60d..00000000000 --- a/php/test/Ice/facets/.depend +++ /dev/null @@ -1 +0,0 @@ -Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB) diff --git a/php/test/Ice/facets/.depend.mak b/php/test/Ice/facets/.depend.mak index 8751ce66bf8..4eba865be84 100644 --- a/php/test/Ice/facets/.depend.mak +++ b/php/test/Ice/facets/.depend.mak @@ -1 +1,3 @@ -Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" + +Test.php: \ + Test.ice diff --git a/php/test/Ice/facets/Makefile b/php/test/Ice/facets/Makefile index f8d515d687f..50caec1448b 100644 --- a/php/test/Ice/facets/Makefile +++ b/php/test/Ice/facets/Makefile @@ -12,15 +12,3 @@ top_srcdir = ../../.. 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 53c8f118100..2534a99ee82 100644 --- a/php/test/Ice/facets/Makefile.mak +++ b/php/test/Ice/facets/Makefile.mak @@ -9,16 +9,6 @@ top_srcdir = ..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = Test.php - -all:: $(SRCS) +SLICE_SRCS = Test.ice -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice - -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/info/.depend b/php/test/Ice/info/.depend deleted file mode 100644 index 5c9804ba170..00000000000 --- a/php/test/Ice/info/.depend +++ /dev/null @@ -1 +0,0 @@ -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 index 78d91dc331a..4567f9518b2 100644 --- a/php/test/Ice/info/.depend.mak +++ b/php/test/Ice/info/.depend.mak @@ -1 +1,8 @@ -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)" + +Test.php: \ + Test.ice \ + $(slicedir)/Ice/Current.ice \ + $(slicedir)/Ice/ObjectAdapterF.ice \ + $(slicedir)/Ice/ConnectionF.ice \ + $(slicedir)/Ice/Identity.ice \ + $(slicedir)/Ice/Version.ice diff --git a/php/test/Ice/info/Makefile b/php/test/Ice/info/Makefile index f8d515d687f..50caec1448b 100644 --- a/php/test/Ice/info/Makefile +++ b/php/test/Ice/info/Makefile @@ -12,15 +12,3 @@ top_srcdir = ../../.. 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 53c8f118100..2534a99ee82 100644 --- a/php/test/Ice/info/Makefile.mak +++ b/php/test/Ice/info/Makefile.mak @@ -9,16 +9,6 @@ top_srcdir = ..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = Test.php - -all:: $(SRCS) +SLICE_SRCS = Test.ice -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice - -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/inheritance/.depend b/php/test/Ice/inheritance/.depend deleted file mode 100644 index f6d6205e60d..00000000000 --- a/php/test/Ice/inheritance/.depend +++ /dev/null @@ -1 +0,0 @@ -Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB) diff --git a/php/test/Ice/inheritance/.depend.mak b/php/test/Ice/inheritance/.depend.mak index 8751ce66bf8..4eba865be84 100644 --- a/php/test/Ice/inheritance/.depend.mak +++ b/php/test/Ice/inheritance/.depend.mak @@ -1 +1,3 @@ -Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" + +Test.php: \ + Test.ice diff --git a/php/test/Ice/inheritance/Makefile b/php/test/Ice/inheritance/Makefile index f8d515d687f..50caec1448b 100644 --- a/php/test/Ice/inheritance/Makefile +++ b/php/test/Ice/inheritance/Makefile @@ -12,15 +12,3 @@ top_srcdir = ../../.. 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 53c8f118100..2534a99ee82 100644 --- a/php/test/Ice/inheritance/Makefile.mak +++ b/php/test/Ice/inheritance/Makefile.mak @@ -9,16 +9,6 @@ top_srcdir = ..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = Test.php - -all:: $(SRCS) +SLICE_SRCS = Test.ice -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice - -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/objects/.depend b/php/test/Ice/objects/.depend deleted file mode 100644 index f6d6205e60d..00000000000 --- a/php/test/Ice/objects/.depend +++ /dev/null @@ -1 +0,0 @@ -Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB) diff --git a/php/test/Ice/objects/.depend.mak b/php/test/Ice/objects/.depend.mak index 8751ce66bf8..4eba865be84 100644 --- a/php/test/Ice/objects/.depend.mak +++ b/php/test/Ice/objects/.depend.mak @@ -1 +1,3 @@ -Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" + +Test.php: \ + Test.ice diff --git a/php/test/Ice/objects/Makefile b/php/test/Ice/objects/Makefile index f8d515d687f..50caec1448b 100644 --- a/php/test/Ice/objects/Makefile +++ b/php/test/Ice/objects/Makefile @@ -12,15 +12,3 @@ top_srcdir = ../../.. 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 53c8f118100..2534a99ee82 100644 --- a/php/test/Ice/objects/Makefile.mak +++ b/php/test/Ice/objects/Makefile.mak @@ -9,16 +9,6 @@ top_srcdir = ..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = Test.php - -all:: $(SRCS) +SLICE_SRCS = Test.ice -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice - -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/operations/.depend b/php/test/Ice/operations/.depend deleted file mode 100644 index f6d6205e60d..00000000000 --- a/php/test/Ice/operations/.depend +++ /dev/null @@ -1 +0,0 @@ -Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB) diff --git a/php/test/Ice/operations/.depend.mak b/php/test/Ice/operations/.depend.mak index 8751ce66bf8..4eba865be84 100644 --- a/php/test/Ice/operations/.depend.mak +++ b/php/test/Ice/operations/.depend.mak @@ -1 +1,3 @@ -Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" + +Test.php: \ + Test.ice diff --git a/php/test/Ice/operations/Makefile b/php/test/Ice/operations/Makefile index f8d515d687f..50caec1448b 100644 --- a/php/test/Ice/operations/Makefile +++ b/php/test/Ice/operations/Makefile @@ -12,15 +12,3 @@ top_srcdir = ../../.. 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 53c8f118100..2534a99ee82 100644 --- a/php/test/Ice/operations/Makefile.mak +++ b/php/test/Ice/operations/Makefile.mak @@ -9,16 +9,6 @@ top_srcdir = ..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = Test.php - -all:: $(SRCS) +SLICE_SRCS = Test.ice -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice - -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/optional/.depend b/php/test/Ice/optional/.depend deleted file mode 100644 index ef3f3f858ca..00000000000 --- a/php/test/Ice/optional/.depend +++ /dev/null @@ -1,2 +0,0 @@ -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 index c0d82ee1596..a35bc02cce2 100644 --- a/php/test/Ice/optional/.depend.mak +++ b/php/test/Ice/optional/.depend.mak @@ -1,2 +1,7 @@ -ClientPrivate.php: ClientPrivate.ice ./Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" -Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" + +ClientPrivate.php: \ + ClientPrivate.ice \ + ./Test.ice + +Test.php: \ + Test.ice diff --git a/php/test/Ice/optional/Makefile b/php/test/Ice/optional/Makefile index 72ee2ed2d4a..e6652d9e4ab 100644 --- a/php/test/Ice/optional/Makefile +++ b/php/test/Ice/optional/Makefile @@ -11,17 +11,6 @@ top_srcdir = ../../.. SLICE_SRCS = ClientPrivate.ice Test.ice -include $(top_srcdir)/config/Make.rules.php - -SRCS = ClientPrivate.php Test.php -SLICE2PHPFLAGS := -I. $(SLICE2PHPFLAGS) - -all:: $(SRCS) +SLICE2PHPFLAGS = -I. -%.php: %.ice - $(SLICE2PHP) $(SLICE2PHPFLAGS) $< - -clean:: - rm -f $(SRCS) - -include .depend +include $(top_srcdir)/config/Make.rules.php diff --git a/php/test/Ice/optional/Makefile.mak b/php/test/Ice/optional/Makefile.mak index 0d5e1dad2c7..c97672be9aa 100644 --- a/php/test/Ice/optional/Makefile.mak +++ b/php/test/Ice/optional/Makefile.mak @@ -9,17 +9,7 @@ top_srcdir = ..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = ClientPrivate.php Test.php -SLICE2PHPFLAGS = -I. $(SLICE2PHPFLAGS) - -all:: $(SRCS) +SLICE_SRCS = ClientPrivate.ice Test.ice +SLICE2PHPFLAGS = -I. -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice - -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/proxy/.depend b/php/test/Ice/proxy/.depend deleted file mode 100644 index f6d6205e60d..00000000000 --- a/php/test/Ice/proxy/.depend +++ /dev/null @@ -1 +0,0 @@ -Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB) diff --git a/php/test/Ice/proxy/.depend.mak b/php/test/Ice/proxy/.depend.mak index 8751ce66bf8..4eba865be84 100644 --- a/php/test/Ice/proxy/.depend.mak +++ b/php/test/Ice/proxy/.depend.mak @@ -1 +1,3 @@ -Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" + +Test.php: \ + Test.ice diff --git a/php/test/Ice/proxy/Makefile b/php/test/Ice/proxy/Makefile index f8d515d687f..50caec1448b 100644 --- a/php/test/Ice/proxy/Makefile +++ b/php/test/Ice/proxy/Makefile @@ -12,15 +12,3 @@ top_srcdir = ../../.. 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 53c8f118100..2534a99ee82 100644 --- a/php/test/Ice/proxy/Makefile.mak +++ b/php/test/Ice/proxy/Makefile.mak @@ -9,16 +9,6 @@ top_srcdir = ..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = Test.php - -all:: $(SRCS) +SLICE_SRCS = Test.ice -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice - -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/slicing/exceptions/.depend b/php/test/Ice/slicing/exceptions/.depend deleted file mode 100644 index f6d6205e60d..00000000000 --- a/php/test/Ice/slicing/exceptions/.depend +++ /dev/null @@ -1 +0,0 @@ -Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB) diff --git a/php/test/Ice/slicing/exceptions/.depend.mak b/php/test/Ice/slicing/exceptions/.depend.mak index 8751ce66bf8..4eba865be84 100644 --- a/php/test/Ice/slicing/exceptions/.depend.mak +++ b/php/test/Ice/slicing/exceptions/.depend.mak @@ -1 +1,3 @@ -Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" + +Test.php: \ + Test.ice diff --git a/php/test/Ice/slicing/exceptions/Makefile b/php/test/Ice/slicing/exceptions/Makefile index 0484f38456c..259a0793291 100644 --- a/php/test/Ice/slicing/exceptions/Makefile +++ b/php/test/Ice/slicing/exceptions/Makefile @@ -12,15 +12,3 @@ top_srcdir = ../../../.. 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 7416e5226c0..7920a51ab6a 100644 --- a/php/test/Ice/slicing/exceptions/Makefile.mak +++ b/php/test/Ice/slicing/exceptions/Makefile.mak @@ -9,16 +9,6 @@ top_srcdir = ..\..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = Test.php - -all:: $(SRCS) +SLICE_SRCS = Test.ice -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice - -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/slicing/objects/.depend b/php/test/Ice/slicing/objects/.depend deleted file mode 100644 index f6d6205e60d..00000000000 --- a/php/test/Ice/slicing/objects/.depend +++ /dev/null @@ -1 +0,0 @@ -Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB) diff --git a/php/test/Ice/slicing/objects/.depend.mak b/php/test/Ice/slicing/objects/.depend.mak index 8751ce66bf8..6b5b452508e 100644 --- a/php/test/Ice/slicing/objects/.depend.mak +++ b/php/test/Ice/slicing/objects/.depend.mak @@ -1 +1,10 @@ -Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" + +ClientPrivate.php: \ + ClientPrivate.ice \ + ./Test.ice + +Forward.php: \ + Forward.ice + +Test.php: \ + Test.ice diff --git a/php/test/Ice/slicing/objects/Makefile b/php/test/Ice/slicing/objects/Makefile index ffc0c0685f8..259a0793291 100644 --- a/php/test/Ice/slicing/objects/Makefile +++ b/php/test/Ice/slicing/objects/Makefile @@ -12,15 +12,3 @@ top_srcdir = ../../../.. 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 52ff0abeb15..5bee461121b 100644 --- a/php/test/Ice/slicing/objects/Makefile.mak +++ b/php/test/Ice/slicing/objects/Makefile.mak @@ -9,16 +9,8 @@ top_srcdir = ..\..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = ClientPrivate.php Forward.php Test.php - -all:: $(SRCS) +SLICE_SRCS = ClientPrivate.ice Forward.ice Test.ice -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) -I. $*.ice +SLICE2PHPFLAGS = -I. -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Slice/keyword/.depend b/php/test/Slice/keyword/.depend deleted file mode 100644 index e2e02ab730d..00000000000 --- a/php/test/Slice/keyword/.depend +++ /dev/null @@ -1 +0,0 @@ -Key.php: Key.ice $(SLICE2PHP) $(SLICEPARSERLIB) diff --git a/php/test/Slice/keyword/.depend.mak b/php/test/Slice/keyword/.depend.mak index 51a68e0ee31..1c84324efb9 100644 --- a/php/test/Slice/keyword/.depend.mak +++ b/php/test/Slice/keyword/.depend.mak @@ -1 +1,3 @@ -Key.php: Key.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" + +Key.php: \ + Key.ice diff --git a/php/test/Slice/keyword/Makefile b/php/test/Slice/keyword/Makefile index 0eb38d159ac..1b12e62fb3f 100644 --- a/php/test/Slice/keyword/Makefile +++ b/php/test/Slice/keyword/Makefile @@ -11,17 +11,6 @@ top_srcdir = ../../.. SLICE_SRCS = Key.ice -include $(top_srcdir)/config/Make.rules.php - -SRCS = Key.php -SLICE2PHPFLAGS := --underscore $(SLICE2PHPFLAGS) - -all:: $(SRCS) +SLICE2PHPFLAGS = --underscore -%.php: %.ice - $(SLICE2PHP) $(SLICE2PHPFLAGS) $< - -clean:: - rm -f $(SRCS) - -include .depend +include $(top_srcdir)/config/Make.rules.php diff --git a/php/test/Slice/keyword/Makefile.mak b/php/test/Slice/keyword/Makefile.mak index e58fe151b7a..785917963e8 100644 --- a/php/test/Slice/keyword/Makefile.mak +++ b/php/test/Slice/keyword/Makefile.mak @@ -9,17 +9,7 @@ top_srcdir = ..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = Key.php -SLICE2PHPFLAGS = --underscore $(SLICE2PHPFLAGS) - -all:: $(SRCS) +SLICE_SRCS = Key.ice +SLICE2PHPFLAGS = --underscore -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice - -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Slice/macros/.depend b/php/test/Slice/macros/.depend deleted file mode 100644 index f6d6205e60d..00000000000 --- a/php/test/Slice/macros/.depend +++ /dev/null @@ -1 +0,0 @@ -Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB) diff --git a/php/test/Slice/macros/.depend.mak b/php/test/Slice/macros/.depend.mak index 8751ce66bf8..4eba865be84 100644 --- a/php/test/Slice/macros/.depend.mak +++ b/php/test/Slice/macros/.depend.mak @@ -1 +1,3 @@ -Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" + +Test.php: \ + Test.ice diff --git a/php/test/Slice/macros/Makefile b/php/test/Slice/macros/Makefile index f8d515d687f..50caec1448b 100644 --- a/php/test/Slice/macros/Makefile +++ b/php/test/Slice/macros/Makefile @@ -12,15 +12,3 @@ top_srcdir = ../../.. 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 53c8f118100..2534a99ee82 100644 --- a/php/test/Slice/macros/Makefile.mak +++ b/php/test/Slice/macros/Makefile.mak @@ -9,16 +9,6 @@ top_srcdir = ..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = Test.php - -all:: $(SRCS) +SLICE_SRCS = Test.ice -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice - -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Slice/structure/.depend b/php/test/Slice/structure/.depend deleted file mode 100644 index f6d6205e60d..00000000000 --- a/php/test/Slice/structure/.depend +++ /dev/null @@ -1 +0,0 @@ -Test.php: Test.ice $(SLICE2PHP) $(SLICEPARSERLIB) diff --git a/php/test/Slice/structure/.depend.mak b/php/test/Slice/structure/.depend.mak index 8751ce66bf8..4eba865be84 100644 --- a/php/test/Slice/structure/.depend.mak +++ b/php/test/Slice/structure/.depend.mak @@ -1 +1,3 @@ -Test.php: Test.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" + +Test.php: \ + Test.ice diff --git a/php/test/Slice/structure/Makefile b/php/test/Slice/structure/Makefile index f8d515d687f..50caec1448b 100644 --- a/php/test/Slice/structure/Makefile +++ b/php/test/Slice/structure/Makefile @@ -12,15 +12,3 @@ top_srcdir = ../../.. 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 53c8f118100..2534a99ee82 100644 --- a/php/test/Slice/structure/Makefile.mak +++ b/php/test/Slice/structure/Makefile.mak @@ -9,16 +9,6 @@ top_srcdir = ..\..\.. -!include $(top_srcdir)\config\Make.rules.mak.php - -SRCS = Test.php - -all:: $(SRCS) +SLICE_SRCS = Test.ice -$(SRCS): $*.ice - -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) $*.ice - -clean:: - del /q $(SRCS) - -include .depend.mak +!include $(top_srcdir)\config\Make.rules.mak.php |