fixed compiling CppClassesInPhp, renamed compile-extensions to your-first-extension, and modified the content

3 files changed, 129 insertions, 26 deletions

diff --git a/Examples/CppClassesInPhp/Makefile b/Examples/CppClassesInPhp/Makefile
index 872cce3..581a50e 100644
--- a/Examples/CppClassesInPhp/Makefile
+++ b/Examples/CppClassesInPhp/Makefile
@@ -1,32 +1,135 @@
-CPP             = g++
-RM              = rm -f
-CPP_FLAGS       = -Wall -c -I. -g -std=c++11
+#
+#	Makefile template
+#
+#	This is an example Makefile that can be used by anyone who is building
+#	his or her own PHP extensions using the PHP-CPP library. 
+#
+#	In the top part of this file we have included variables that can be
+#	altered to fit your configuration, near the bottom the instructions and
+#	dependencies for the compiler are defined. The deeper you get into this
+#	file, the less likely it is that you will have to change anything in it.
+#
 
-PREFIX			= /usr
-#Edit these lines to correspond with your own directories
-LIBRARY_DIR		= ${PREFIX}/lib/php5/20090626
-PHP_CONFIG_DIR	= /etc/php5/cli/conf.d
+#
+#	Name of your extension
+#
+#	This is the name of your extension. Based on this extension name, the
+#	name of the library file (name.so) and the name of the config file (name.ini)
+#	are automatically generated
+#
 
-LD              = g++
-LD_FLAGS        = -Wall -shared -O2 
-RESULT          = cppclassinphp.so
+NAME				=	cppclassinphp
 
-PHPINIFILE		= 30-cppclassinphp.ini
 
-SOURCES			= $(wildcard *.cpp)
-OBJECTS         = $(SOURCES:%.cpp=%.o)
+#
+#	Php.ini directories
+#
+#	In the past, PHP used a single php.ini configuration file. Today, most
+#	PHP installations use a conf.d directory that holds a set of config files,
+#	one for each extension. Use this variable to specify this directory.
+#
 
-all:	${OBJECTS} ${RESULT}
+INI_DIR				=	/etc/php5/conf.d
 
-${RESULT}: ${OBJECTS}
-		${LD} ${LD_FLAGS} -o $@ ${OBJECTS} -lphpcpp
 
-clean:
-		${RM} *.obj *~* ${OBJECTS} ${RESULT}
+#
+#	The extension dirs
+#
+#	This is normally a directory like /usr/lib/php5/20121221 (based on the 
+#	PHP version that you use. We make use of the command line 'php-config' 
+#	instruction to find out what the extension directory is, you can override
+#	this with a different fixed directory
+#
+
+EXTENSION_DIR		=	$(shell php-config --extension-dir)
+
+
+#
+#	The name of the extension and the name of the .ini file
+#
+#	These two variables are based on the name of the extension. We simply add
+#	a certain extension to them (.so or .ini)
+#
+
+EXTENSION 			=	${NAME}.so
+INI 				=	${NAME}.ini
+
+
+#
+#	Compiler
+#
+#	By default, the GNU C++ compiler is used. If you want to use a different
+#	compiler, you can change that here. You can change this for both the 
+#	compiler (the program that turns the c++ files into object files) and for
+#	the linker (the program that links all object files into the single .so
+#	library file. By default, g++ (the GNU C++ compiler) is used for both.
+#
+
+COMPILER			=	g++
+LINKER				=	g++
+
+
+#
+#	Compiler and linker flags
+#
+#	This variable holds the flags that are passed to the compiler. By default, 
+# 	we include the -O2 flag. This flag tells the compiler to optimize the code, 
+#	but it makes debugging more difficult. So if you're debugging your application, 
+#	you probably want to remove this -O2 flag. At the same time, you can then 
+#	add the -g flag to instruct the compiler to include debug information in
+#	the library (but this will make the final libphpcpp.so file much bigger, so
+#	you want to leave that flag out on production servers).
+#
+#	If your extension depends on other libraries (and it does at least depend on
+#	one: the PHP-CPP library), you should update the LINKER_DEPENDENCIES variable
+#	with a list of all flags that should be passed to the linker.
+#
+
+COMPILER_FLAGS		=	-Wall -c -O2 -std=c++11 -fpic -o
+LINKER_FLAGS		=	-shared
+LINKER_DEPENDENCIES	=	-lphpcpp
+
 
-${OBJECTS}: 
-		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
+#
+#	Command to remove files, copy files and create directories.
+#
+#	I've never encountered a *nix environment in which these commands do not work. 
+#	So you can probably leave this as it is
+#
+
+RM					=	rm -f
+CP					=	cp -f
+MKDIR				=	mkdir -p
+
+
+#
+#	All source files are simply all *.cpp files found in the current directory
+#
+#	A builtin Makefile macro is used to scan the current directory and find 
+#	all source files. The object files are all compiled versions of the source
+#	file, with the .cpp extension being replaced by .o.
+#
+
+SOURCES				=	$(wildcard *.cpp)
+OBJECTS				=	$(SOURCES:%.cpp=%.o)
+
+
+#
+#	From here the build instructions start
+#
+
+all:					${OBJECTS} ${EXTENSION}
+
+${EXTENSION}:			${OBJECTS}
+						${LINKER} ${LINKER_FLAGS} -o $@ ${OBJECTS} ${LINKER_DEPENDENCIES}
+
+${OBJECTS}:
+						${COMPILER} ${COMPILER_FLAGS} $@ ${@:%.o=%.cpp}
+
+install:		
+						${CP} ${EXTENSION} ${EXTENSION_DIR}
+						${CP} ${INI} ${INI_DIR}
+				
+clean:
+						${RM} ${EXTENSION} ${OBJECTS}
 
-install:
-		cp -f ${RESULT} ${LIBRARY_DIR}
-		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}
diff --git a/Examples/CppClassesInPhp/cppclassinphp.cpp b/Examples/CppClassesInPhp/cppclassinphp.cpp
index b3f2bac..400d942 100644
--- a/Examples/CppClassesInPhp/cppclassinphp.cpp
+++ b/Examples/CppClassesInPhp/cppclassinphp.cpp
@@ -129,6 +129,6 @@ extern "C"
         extension.add(customClass);
         
         // return the extension module
-        return extension.module();
+        return extension;
     }
 }
diff --git a/Examples/EmptyExtension/main.cpp b/Examples/EmptyExtension/main.cpp
index 22aba90..b4c4426 100644
--- a/Examples/EmptyExtension/main.cpp
+++ b/Examples/EmptyExtension/main.cpp
@@ -16,11 +16,11 @@ extern "C" {
     {
         // static(!) Php::Extension object that should stay in memory
         // for the entire duration of the process (that's why it's static)
-        static Php::Extension myExtension("my_extension", "1.0");
+        static Php::Extension extension("yourextension", "1.0");
         
         // @todo    add your own functions, classes, namespaces to the extension
         
         // return the extension
-        return myExtension;
+        return extension;
     }
 }