From 76f8a944540a84b6a5c98135bd9f9e6e996fe37d Mon Sep 17 00:00:00 2001
From: Emiel Bruijntjes <emiel.bruijntjes@copernica.com>
Date: Wed, 10 Jun 2015 15:35:56 +0200
Subject: removed hhvm code, it does not work now and wont work for the
 foreseeable future

---
 Makefile | 46 +++++++---------------------------------------
 1 file changed, 7 insertions(+), 39 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 57c4a93..3c64e35 100644
--- a/Makefile
+++ b/Makefile
@@ -68,8 +68,6 @@ VERSION					=	1.4.0
 
 PHP_SHARED_LIBRARY		=	libphpcpp.so.$(VERSION)
 PHP_STATIC_LIBRARY		=	libphpcpp.a.$(VERSION)
-HHVM_SHARED_LIBRARY		=	libhhvmcpp.so.$(VERSION)
-HHVM_STATIC_LIBRARY		=	libhhvmcpp.a.$(VERSION)
 
 
 #
@@ -112,7 +110,6 @@ COMPILER_FLAGS			=	-Wall -c -std=c++11 -fvisibility=hidden -DBUILDING_PHPCPP
 SHARED_COMPILER_FLAGS	=	-fpic
 STATIC_COMPILER_FLAGS	=
 PHP_COMPILER_FLAGS		=	${COMPILER_FLAGS} `${PHP_CONFIG} --includes`
-HHVM_COMPILER_FLAGS		=	${COMPILER_FLAGS}
 
 #
 #   Linker flags
@@ -126,7 +123,6 @@ HHVM_COMPILER_FLAGS		=	${COMPILER_FLAGS}
 
 LINKER_FLAGS			=	-shared
 PHP_LINKER_FLAGS		=	${LINKER_FLAGS} `${PHP_CONFIG} --ldflags`
-HHVM_LINKER_FLAGS		=	${LINKER_FLAGS}
 
 
 #
@@ -146,29 +142,25 @@ MKDIR					=	mkdir -p
 #   The source files
 #
 #   For this we use a special Makefile function that automatically scans the
-#   common/, zend/ and hhvm/ directories for all *.cpp files. No changes are
+#   common/ and zend/ directories for all *.cpp files. No changes are
 #   probably necessary here
 #
 
 COMMON_SOURCES			=	$(wildcard common/*.cpp)
 PHP_SOURCES				=	$(wildcard zend/*.cpp)
-HHVM_SOURCES			=	$(wildcard hhvm/*.cpp)
 
 #
 #   The object files
 #
 #   The intermediate object files are generated by the compiler right before
-#   the linker turns all these object files into the libphpcpp.so and
-#   libhhvmcpp.so shared libraries. We also use a Makefile function here that
-#   takes all source files.
+#   the linker turns all these object files into the libphpcpp.so shared
+#   library. We also use a Makefile function here that takes all source files.
 #
 
 COMMON_SHARED_OBJECTS	=	$(COMMON_SOURCES:%.cpp=shared/%.o)
 PHP_SHARED_OBJECTS		=	$(PHP_SOURCES:%.cpp=shared/%.o)
-HHVM_SHARED_OBJECTS		=	$(HHVM_SOURCES:%.cpp=shared/%.o)
 COMMON_STATIC_OBJECTS	=	$(COMMON_SOURCES:%.cpp=static/%.o)
 PHP_STATIC_OBJECTS		=	$(PHP_SOURCES:%.cpp=static/%.o)
-HHVM_STATIC_OBJECTS		=	$(HHVM_SOURCES:%.cpp=static/%.o)
 
 
 #
@@ -188,35 +180,23 @@ phpcpp: ${PHP_SHARED_LIBRARY} ${PHP_STATIC_LIBRARY}
 	@echo
 	@echo "Build complete."
 
-hhvmcpp: ${HHVM_SHARED_LIBRARY} ${PHP_STATIC_LIBRARY}
-	@echo
-	@echo "Build complete."
-
 ${PHP_SHARED_LIBRARY}: shared_directories ${COMMON_SHARED_OBJECTS} ${PHP_SHARED_OBJECTS}
 	${LINKER} ${PHP_LINKER_FLAGS} -Wl,-soname,libphpcpp.so.$(SONAME) -o $@ ${COMMON_SHARED_OBJECTS} ${PHP_SHARED_OBJECTS}
 
 ${PHP_STATIC_LIBRARY}: static_directories ${COMMON_STATIC_OBJECTS} ${PHP_STATIC_OBJECTS}
 	${ARCHIVER} $@ ${COMMON_STATIC_OBJECTS} ${PHP_STATIC_OBJECTS}
 
-${HHVM_SHARED_LIBRARY}: shared_directories ${COMMON_SHARED_OBJECTS} ${HHVM_SHARED_OBJECTS}
-	${LINKER} ${HHVM_LINKER_FLAGS} -Wl,-soname,libhhvmcpp.so.$(SONAME) -o $@ ${COMMON_SHARED_OBJECTS} ${HHVM_SHARED_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} shared ${PHP_SHARED_LIBRARY} ${HHVM_SHARED_LIBRARY}
-	${RM} static ${PHP_STATIC_LIBRARY} ${HHVM_STATIC_LIBRARY}
+	${RM} shared ${PHP_SHARED_LIBRARY}
+	${RM} static ${PHP_STATIC_LIBRARY}
 	find -name *.o | xargs ${RM}
 
 ${COMMON_SHARED_OBJECTS}:
@@ -231,11 +211,6 @@ ${PHP_SHARED_OBJECTS}:
 ${PHP_STATIC_OBJECTS}:
 	${COMPILER} ${PHP_COMPILER_FLAGS} ${STATIC_COMPILER_FLAGS} -o $@ ${@:static/%.o=%.cpp}
 
-${HHVM_SHARED_OBJECTS}:
-	${COMPILER} ${HHVM_COMPILER_FLAGS} ${SHARED_COMPILER_FLAGS} -o $@ ${@:shared/%.o=%.cpp}
-
-${HHVM_STATIC_OBJECTS}:
-	${COMPILER} ${HHVM_COMPILER_FLAGS} ${STATIC_COMPILER_FLAGS} -o $@ ${@:static/%.o=%.cpp}
 
 # The if statements below must be seen as single line by make
 
@@ -251,16 +226,9 @@ install:
 	if [ -e ${PHP_STATIC_LIBRARY} ]; then ${CP} ${PHP_STATIC_LIBRARY} ${INSTALL_LIB}/; \
 		${LN} ${INSTALL_LIB}/${PHP_STATIC_LIBRARY} ${INSTALL_LIB}/libphpcpp.a; \
 	fi
-	if [ -e ${HHVM_SHARED_LIBRARY} ]; then \
-		${CP} ${HHVM_SHARED_LIBRARY} ${INSTALL_LIB}/; \
-		${LN} ${INSTALL_LIB}/${HHVM_SHARED_LIBRARY} ${INSTALL_LIB}/libhhvmcpp.so.$(SONAME);\
-		${LN} ${INSTALL_LIB}/${HHVM_SHARED_LIBRARY} ${INSTALL_LIB}/libhhvmcpp.so; \
-	fi
-	if [ -e ${HHVM_STATIC_LIBRARY} ]; then \
-		${CP} ${HHVM_STATIC_LIBRARY} ${INSTALL_LIB}/; \
-		${LN} ${INSTALL_LIB}/${HHVM_STATIC_LIBRARY} ${INSTALL_LIB}/libhhvmcpp.a; \
+	if `which ldconfig`; then \
+		sudo ldconfig; \
 	fi
-	sudo ldconfig
 
 test:
 	mkdir -p tests/include/zts/phpcpp
-- 
cgit v1.2.3