summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2014-08-29 11:03:46 +0200
committerEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2014-08-29 11:03:46 +0200
commit700a574000d8f5cfdd407a0a4b634ad7fcadc54f (patch)
tree30e643707a597bc436a2c5926eaf475f432fb989 /Makefile
parenta07ce10f4cf00d4547227f3b1359f6058ea83a8d (diff)
updated Makefile to create output dirs first
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile26
1 files changed, 18 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 5527e27..091e8f0 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ INSTALL_LIB = ${INSTALL_PREFIX}/lib
PHP_SHARED_LIBRARY = libphpcpp.so
PHP_STATIC_LIBRARY = libphpcpp.a
HHVM_SHARED_LIBRARY = libhhvmcpp.so
-HHVM_STATIC_LIBRARY = libhhvmcpp.so
+HHVM_STATIC_LIBRARY = libhhvmcpp.a
#
@@ -116,7 +116,7 @@ HHVM_LINKER_FLAGS = ${LINKER_FLAGS}
# So you can probably leave this as it is
#
-RM = rm -f
+RM = rm -fr
CP = cp -f
MKDIR = mkdir -p
@@ -167,21 +167,31 @@ hhvmcpp: ${HHVM_SHARED_LIBRARY} ${PHP_STATIC_LIBRARY}
@echo "Build complete."
@echo "Don't forget to run 'make test'."
-${PHP_SHARED_LIBRARY}: ${COMMON_SHARED_OBJECTS} ${PHP_SHARED_OBJECTS}
+${PHP_SHARED_LIBRARY}: shared_directories ${COMMON_SHARED_OBJECTS} ${PHP_SHARED_OBJECTS}
${LINKER} ${PHP_LINKER_FLAGS} -o $@ ${COMMON_SHARED_OBJECTS} ${PHP_SHARED_OBJECTS}
-${PHP_STATIC_LIBRARY}: ${COMMON_STATIC_OBJECTS} ${PHP_STATIC_OBJECTS}
+${PHP_STATIC_LIBRARY}: static_directories ${COMMON_STATIC_OBJECTS} ${PHP_STATIC_OBJECTS}
${ARCHIVER} $@ ${COMMON_STATIC_OBJECTS} ${PHP_STATIC_OBJECTS}
-${HHVM_SHARED_LIBRARY}: ${COMMON_SHARED_OBJECTS} ${HHVM_SHARED_OBJECTS}
+${HHVM_SHARED_LIBRARY}: shared_directories ${COMMON_SHARED_OBJECTS} ${HHVM_SHARED_OBJECTS}
${LINKER} ${HHVM_LINKER_FLAGS} -o $@ ${COMMON_SHARED_OBJECTS} ${HHVM_SHARED_OBJECTS}
-${HHVM_STATIC_LIBRARY}: ${COMMON_STATIC_OBJECTS} ${HHVM_STATIC_OBJECTS}
+${HHVM_STATIC_LIBRARY}: static_directories ${COMMON_STATIC_OBJECTS} ${HHVM_STATIC_OBJECTS}
${ARCHIVER} $@ ${COMMON_STATIC_OBJECTS} ${HHVM_STATIC_OBJECTS}
+shared_directories:
+ ${MKDIR} shared/common
+ ${MKDIR} shared/zend
+ ${MKDIR} shared/hhvm
+
+static_directories:
+ ${MKDIR} static/common
+ ${MKDIR} static/zend
+ ${MKDIR} static/hhvm
+
clean:
- ${RM} ${COMMON_SHARED_OBJECTS} ${PHP_SHARED_OBJECTS} ${HHVM_SHARED_OBJECTS} ${PHP_SHARED_LIBRARY} ${HHVM_SHARED_LIBRARY}
- ${RM} ${COMMON_STATIC_OBJECTS} ${PHP_STATIC_OBJECTS} ${HHVM_STATIC_OBJECTS} ${PHP_STATIC_LIBRARY} ${HHVM_STATIC_LIBRARY}
+ ${RM} shared ${PHP_SHARED_LIBRARY} ${HHVM_SHARED_LIBRARY}
+ ${RM} static ${PHP_STATIC_LIBRARY} ${HHVM_STATIC_LIBRARY}
${COMMON_SHARED_OBJECTS}:
${COMPILER} ${COMPILER_FLAGS} ${SHARED_COMPILER_FLAGS} -o $@ ${@:shared/%.o=%.cpp}