From 964d6274b0eba38df43d77b87c44bd728d2f0fb5 Mon Sep 17 00:00:00 2001 From: Emiel Bruijntjes Date: Sat, 7 Dec 2013 09:45:35 -0800 Subject: Renamed ini files so that multiple examples can be loaded at the same time --- Examples/CallPhpFunctions/30-callphpfunction.ini | 4 +++ Examples/CallPhpFunctions/30-phpcpp.ini | 4 --- Examples/CallPhpFunctions/Makefile | 2 +- Examples/CppClassesInPhp/30-cppclassinphp.ini | 4 +++ Examples/CppClassesInPhp/30-phpcpp.ini | 4 --- Examples/CppClassesInPhp/Makefile | 2 +- .../ExceptionCatch/30-exceptionCatch.ini | 4 +++ Examples/Exceptions/ExceptionCatch/30-phpcpp.ini | 4 --- Examples/Exceptions/ExceptionCatch/Makefile | 2 +- .../ExceptionThrow/30-exceptionThrow.ini | 4 +++ Examples/Exceptions/ExceptionThrow/30-phpcpp.ini | 4 --- Examples/Exceptions/ExceptionThrow/Makefile | 2 +- .../30-functionnoparameters.ini | 4 +++ Examples/FunctionNoParameters/30-phpcpp.ini | 4 --- Examples/FunctionNoParameters/Makefile | 2 +- .../FunctionReturnValue/30-functionreturnvalue.ini | 4 +++ Examples/FunctionReturnValue/30-phpcpp.ini | 4 --- Examples/FunctionReturnValue/Makefile | 2 +- Examples/FunctionVoid/30-functionvoid.ini | 4 +++ Examples/FunctionVoid/30-phpcpp.ini | 4 --- Examples/FunctionVoid/Makefile | 2 +- .../30-functionwithparameters.ini | 4 +++ Examples/FunctionWithParameters/30-phpcpp.ini | 4 --- Examples/FunctionWithParameters/Makefile | 2 +- Examples/Globals/30-globals.ini | 4 +++ Examples/Globals/30-phpcpp.ini | 4 --- Examples/Globals/Makefile | 32 ++++++++++++++++++++++ 27 files changed, 76 insertions(+), 44 deletions(-) create mode 100644 Examples/CallPhpFunctions/30-callphpfunction.ini delete mode 100644 Examples/CallPhpFunctions/30-phpcpp.ini create mode 100644 Examples/CppClassesInPhp/30-cppclassinphp.ini delete mode 100644 Examples/CppClassesInPhp/30-phpcpp.ini create mode 100644 Examples/Exceptions/ExceptionCatch/30-exceptionCatch.ini delete mode 100644 Examples/Exceptions/ExceptionCatch/30-phpcpp.ini create mode 100644 Examples/Exceptions/ExceptionThrow/30-exceptionThrow.ini delete mode 100644 Examples/Exceptions/ExceptionThrow/30-phpcpp.ini create mode 100644 Examples/FunctionNoParameters/30-functionnoparameters.ini delete mode 100644 Examples/FunctionNoParameters/30-phpcpp.ini create mode 100644 Examples/FunctionReturnValue/30-functionreturnvalue.ini delete mode 100644 Examples/FunctionReturnValue/30-phpcpp.ini create mode 100644 Examples/FunctionVoid/30-functionvoid.ini delete mode 100644 Examples/FunctionVoid/30-phpcpp.ini create mode 100644 Examples/FunctionWithParameters/30-functionwithparameters.ini delete mode 100644 Examples/FunctionWithParameters/30-phpcpp.ini create mode 100644 Examples/Globals/30-globals.ini delete mode 100644 Examples/Globals/30-phpcpp.ini create mode 100644 Examples/Globals/Makefile (limited to 'Examples') diff --git a/Examples/CallPhpFunctions/30-callphpfunction.ini b/Examples/CallPhpFunctions/30-callphpfunction.ini new file mode 100644 index 0000000..ada5fea --- /dev/null +++ b/Examples/CallPhpFunctions/30-callphpfunction.ini @@ -0,0 +1,4 @@ +; configuration for phpcpp module +; priority=30 +extension=callphpfunction.so + diff --git a/Examples/CallPhpFunctions/30-phpcpp.ini b/Examples/CallPhpFunctions/30-phpcpp.ini deleted file mode 100644 index ada5fea..0000000 --- a/Examples/CallPhpFunctions/30-phpcpp.ini +++ /dev/null @@ -1,4 +0,0 @@ -; configuration for phpcpp module -; priority=30 -extension=callphpfunction.so - diff --git a/Examples/CallPhpFunctions/Makefile b/Examples/CallPhpFunctions/Makefile index 29cf6ee..08312ba 100644 --- a/Examples/CallPhpFunctions/Makefile +++ b/Examples/CallPhpFunctions/Makefile @@ -11,7 +11,7 @@ LD = g++ LD_FLAGS = -Wall -shared -O2 RESULT = callphpfunction.so -PHPINIFILE = 30-phpcpp.ini +PHPINIFILE = 30-callphpfunction.ini SOURCES = $(wildcard *.cpp) OBJECTS = $(SOURCES:%.cpp=%.o) diff --git a/Examples/CppClassesInPhp/30-cppclassinphp.ini b/Examples/CppClassesInPhp/30-cppclassinphp.ini new file mode 100644 index 0000000..8dcc005 --- /dev/null +++ b/Examples/CppClassesInPhp/30-cppclassinphp.ini @@ -0,0 +1,4 @@ +; configuration for phpcpp module +; priority=30 +extension=cppclassinphp.so + diff --git a/Examples/CppClassesInPhp/30-phpcpp.ini b/Examples/CppClassesInPhp/30-phpcpp.ini deleted file mode 100644 index 8dcc005..0000000 --- a/Examples/CppClassesInPhp/30-phpcpp.ini +++ /dev/null @@ -1,4 +0,0 @@ -; configuration for phpcpp module -; priority=30 -extension=cppclassinphp.so - diff --git a/Examples/CppClassesInPhp/Makefile b/Examples/CppClassesInPhp/Makefile index fb549dc..76f0bb1 100644 --- a/Examples/CppClassesInPhp/Makefile +++ b/Examples/CppClassesInPhp/Makefile @@ -11,7 +11,7 @@ LD = g++ LD_FLAGS = -Wall -shared -O2 RESULT = cppclassinphp.so -PHPINIFILE = 30-phpcpp.ini +PHPINIFILE = 30-cppclassinphp.ini SOURCES = $(wildcard *.cpp) OBJECTS = $(SOURCES:%.cpp=%.o) diff --git a/Examples/Exceptions/ExceptionCatch/30-exceptionCatch.ini b/Examples/Exceptions/ExceptionCatch/30-exceptionCatch.ini new file mode 100644 index 0000000..579fced --- /dev/null +++ b/Examples/Exceptions/ExceptionCatch/30-exceptionCatch.ini @@ -0,0 +1,4 @@ +; configuration for phpcpp module +; priority=30 +extension=exceptionCatch.so + diff --git a/Examples/Exceptions/ExceptionCatch/30-phpcpp.ini b/Examples/Exceptions/ExceptionCatch/30-phpcpp.ini deleted file mode 100644 index 579fced..0000000 --- a/Examples/Exceptions/ExceptionCatch/30-phpcpp.ini +++ /dev/null @@ -1,4 +0,0 @@ -; configuration for phpcpp module -; priority=30 -extension=exceptionCatch.so - diff --git a/Examples/Exceptions/ExceptionCatch/Makefile b/Examples/Exceptions/ExceptionCatch/Makefile index 26ca57c..d8d2c74 100644 --- a/Examples/Exceptions/ExceptionCatch/Makefile +++ b/Examples/Exceptions/ExceptionCatch/Makefile @@ -11,7 +11,7 @@ LD = g++ LD_FLAGS = -Wall -shared -O2 RESULT = exceptionCatch.so -PHPINIFILE = 30-phpcpp.ini +PHPINIFILE = 30-exceptionCatch.ini SOURCES = $(wildcard *.cpp) OBJECTS = $(SOURCES:%.cpp=%.o) diff --git a/Examples/Exceptions/ExceptionThrow/30-exceptionThrow.ini b/Examples/Exceptions/ExceptionThrow/30-exceptionThrow.ini new file mode 100644 index 0000000..acf8569 --- /dev/null +++ b/Examples/Exceptions/ExceptionThrow/30-exceptionThrow.ini @@ -0,0 +1,4 @@ +; configuration for phpcpp module +; priority=30 +extension=exceptionThrow.so + diff --git a/Examples/Exceptions/ExceptionThrow/30-phpcpp.ini b/Examples/Exceptions/ExceptionThrow/30-phpcpp.ini deleted file mode 100644 index acf8569..0000000 --- a/Examples/Exceptions/ExceptionThrow/30-phpcpp.ini +++ /dev/null @@ -1,4 +0,0 @@ -; configuration for phpcpp module -; priority=30 -extension=exceptionThrow.so - diff --git a/Examples/Exceptions/ExceptionThrow/Makefile b/Examples/Exceptions/ExceptionThrow/Makefile index ec63508..b153a3f 100644 --- a/Examples/Exceptions/ExceptionThrow/Makefile +++ b/Examples/Exceptions/ExceptionThrow/Makefile @@ -11,7 +11,7 @@ LD = g++ LD_FLAGS = -Wall -shared -O2 RESULT = exceptionThrow.so -PHPINIFILE = 30-phpcpp.ini +PHPINIFILE = 30-exceptionThrow.ini SOURCES = $(wildcard *.cpp) OBJECTS = $(SOURCES:%.cpp=%.o) diff --git a/Examples/FunctionNoParameters/30-functionnoparameters.ini b/Examples/FunctionNoParameters/30-functionnoparameters.ini new file mode 100644 index 0000000..6f3ea7c --- /dev/null +++ b/Examples/FunctionNoParameters/30-functionnoparameters.ini @@ -0,0 +1,4 @@ +; configuration for phpcpp module +; priority=30 +extension=functionnoparameters.so + diff --git a/Examples/FunctionNoParameters/30-phpcpp.ini b/Examples/FunctionNoParameters/30-phpcpp.ini deleted file mode 100644 index 6f3ea7c..0000000 --- a/Examples/FunctionNoParameters/30-phpcpp.ini +++ /dev/null @@ -1,4 +0,0 @@ -; configuration for phpcpp module -; priority=30 -extension=functionnoparameters.so - diff --git a/Examples/FunctionNoParameters/Makefile b/Examples/FunctionNoParameters/Makefile index 6e3ecea..e170ba3 100644 --- a/Examples/FunctionNoParameters/Makefile +++ b/Examples/FunctionNoParameters/Makefile @@ -11,7 +11,7 @@ LD = g++ LD_FLAGS = -Wall -shared -O2 RESULT = functionnoparameters.so -PHPINIFILE = 30-phpcpp.ini +PHPINIFILE = 30-functionnoparameters.ini SOURCES = $(wildcard *.cpp) OBJECTS = $(SOURCES:%.cpp=%.o) diff --git a/Examples/FunctionReturnValue/30-functionreturnvalue.ini b/Examples/FunctionReturnValue/30-functionreturnvalue.ini new file mode 100644 index 0000000..34c46cd --- /dev/null +++ b/Examples/FunctionReturnValue/30-functionreturnvalue.ini @@ -0,0 +1,4 @@ +; configuration for phpcpp module +; priority=30 +extension=functionreturnvalue.so + diff --git a/Examples/FunctionReturnValue/30-phpcpp.ini b/Examples/FunctionReturnValue/30-phpcpp.ini deleted file mode 100644 index 34c46cd..0000000 --- a/Examples/FunctionReturnValue/30-phpcpp.ini +++ /dev/null @@ -1,4 +0,0 @@ -; configuration for phpcpp module -; priority=30 -extension=functionreturnvalue.so - diff --git a/Examples/FunctionReturnValue/Makefile b/Examples/FunctionReturnValue/Makefile index 2d9f401..cf41971 100644 --- a/Examples/FunctionReturnValue/Makefile +++ b/Examples/FunctionReturnValue/Makefile @@ -11,7 +11,7 @@ LD = g++ LD_FLAGS = -Wall -shared -O2 RESULT = functionreturnvalue.so -PHPINIFILE = 30-phpcpp.ini +PHPINIFILE = 30-functionreturnvalue.ini SOURCES = $(wildcard *.cpp) OBJECTS = $(SOURCES:%.cpp=%.o) diff --git a/Examples/FunctionVoid/30-functionvoid.ini b/Examples/FunctionVoid/30-functionvoid.ini new file mode 100644 index 0000000..1cb5f03 --- /dev/null +++ b/Examples/FunctionVoid/30-functionvoid.ini @@ -0,0 +1,4 @@ +; configuration for phpcpp module +; priority=30 +extension=functionvoid.so + diff --git a/Examples/FunctionVoid/30-phpcpp.ini b/Examples/FunctionVoid/30-phpcpp.ini deleted file mode 100644 index 1cb5f03..0000000 --- a/Examples/FunctionVoid/30-phpcpp.ini +++ /dev/null @@ -1,4 +0,0 @@ -; configuration for phpcpp module -; priority=30 -extension=functionvoid.so - diff --git a/Examples/FunctionVoid/Makefile b/Examples/FunctionVoid/Makefile index 4925cfd..fc14780 100644 --- a/Examples/FunctionVoid/Makefile +++ b/Examples/FunctionVoid/Makefile @@ -11,7 +11,7 @@ LD = g++ LD_FLAGS = -Wall -shared -O2 RESULT = functionvoid.so -PHPINIFILE = 30-phpcpp.ini +PHPINIFILE = 30-functionvoid.ini SOURCES = $(wildcard *.cpp) OBJECTS = $(SOURCES:%.cpp=%.o) diff --git a/Examples/FunctionWithParameters/30-functionwithparameters.ini b/Examples/FunctionWithParameters/30-functionwithparameters.ini new file mode 100644 index 0000000..04961a9 --- /dev/null +++ b/Examples/FunctionWithParameters/30-functionwithparameters.ini @@ -0,0 +1,4 @@ +; configuration for phpcpp module +; priority=30 +extension=functionwithparameters.so + diff --git a/Examples/FunctionWithParameters/30-phpcpp.ini b/Examples/FunctionWithParameters/30-phpcpp.ini deleted file mode 100644 index 04961a9..0000000 --- a/Examples/FunctionWithParameters/30-phpcpp.ini +++ /dev/null @@ -1,4 +0,0 @@ -; configuration for phpcpp module -; priority=30 -extension=functionwithparameters.so - diff --git a/Examples/FunctionWithParameters/Makefile b/Examples/FunctionWithParameters/Makefile index 1a39c1e..271e019 100644 --- a/Examples/FunctionWithParameters/Makefile +++ b/Examples/FunctionWithParameters/Makefile @@ -11,7 +11,7 @@ LD = g++ LD_FLAGS = -Wall -shared -O2 RESULT = functionwithparameters.so -PHPINIFILE = 30-phpcpp.ini +PHPINIFILE = 30-functionwithparameters.ini SOURCES = $(wildcard *.cpp) OBJECTS = $(SOURCES:%.cpp=%.o) diff --git a/Examples/Globals/30-globals.ini b/Examples/Globals/30-globals.ini new file mode 100644 index 0000000..3b6ae4e --- /dev/null +++ b/Examples/Globals/30-globals.ini @@ -0,0 +1,4 @@ +; configuration for phpcpp module +; priority=30 +extension=globals.so + diff --git a/Examples/Globals/30-phpcpp.ini b/Examples/Globals/30-phpcpp.ini deleted file mode 100644 index 3b6ae4e..0000000 --- a/Examples/Globals/30-phpcpp.ini +++ /dev/null @@ -1,4 +0,0 @@ -; configuration for phpcpp module -; priority=30 -extension=globals.so - diff --git a/Examples/Globals/Makefile b/Examples/Globals/Makefile new file mode 100644 index 0000000..764fb5f --- /dev/null +++ b/Examples/Globals/Makefile @@ -0,0 +1,32 @@ +CPP = g++ +RM = rm -f +CPP_FLAGS = -Wall -c -I. -O2 -std=c++11 + +PREFIX = /usr +#Edit these lines to correspond with your own directories +LIBRARY_DIR = ${PREFIX}/lib/php5/20121212 +PHP_CONFIG_DIR = /etc/php5/cli/conf.d + +LD = g++ +LD_FLAGS = -Wall -shared -O2 +RESULT = globals.so + +PHPINIFILE = 30-globals.ini + +SOURCES = $(wildcard *.cpp) +OBJECTS = $(SOURCES:%.cpp=%.o) + +all: ${OBJECTS} ${RESULT} + +${RESULT}: ${OBJECTS} + ${LD} ${LD_FLAGS} -o $@ ${OBJECTS} -lphpcpp + +clean: + ${RM} *.obj *~* ${OBJECTS} ${RESULT} + +${OBJECTS}: + ${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp} + +install: + cp -f ${RESULT} ${LIBRARY_DIR} + cp -f ${PHPINIFILE} ${PHP_CONFIG_DIR} -- cgit v1.2.3