diff options
| author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-12-30 09:15:31 +0100 |
|---|---|---|
| committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-12-30 09:15:31 +0100 |
| commit | bdbc7b6c2430aaf396f79fc9ca097534f2c964ac (patch) | |
| tree | d357ae8ddddf869c8ec3eba77ec00a24f2cd45c4 /Makefile | |
| parent | cd2284df9dbecff9dafb0dea1b176b2d5934356f (diff) | |
rollback change from issue #149
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 66 |
1 files changed, 33 insertions, 33 deletions
@@ -17,7 +17,7 @@ # installed in the default directory, you can change that here. # -PHP_CONFIG = php-config +PHP_CONFIG = php-config # @@ -29,7 +29,7 @@ PHP_CONFIG = php-config # Usually /usr/bin/php # -PHP_BIN = $(shell ${PHP_CONFIG} --php-binary) +PHP_BIN = $(shell ${PHP_CONFIG} --php-binary) # @@ -42,9 +42,9 @@ PHP_BIN = $(shell ${PHP_CONFIG} --php-binary) # and /usr/local/lib. You can of course change it to whatever suits you best # -INSTALL_PREFIX = /usr -INSTALL_HEADERS = ${INSTALL_PREFIX}/include -INSTALL_LIB = $(shell cat /etc/ld.so.conf.d/libc.conf | grep -v "\#" | head -1) +INSTALL_PREFIX = /usr +INSTALL_HEADERS = ${INSTALL_PREFIX}/include +INSTALL_LIB = ${INSTALL_PREFIX}/lib # @@ -55,10 +55,10 @@ INSTALL_LIB = $(shell cat /etc/ld.so.conf.d/libc.conf | grep -v "\#" | h # you can change that here. # -PHP_SHARED_LIBRARY = libphpcpp.so -PHP_STATIC_LIBRARY = libphpcpp.a -HHVM_SHARED_LIBRARY = libhhvmcpp.so -HHVM_STATIC_LIBRARY = libhhvmcpp.a +PHP_SHARED_LIBRARY = libphpcpp.so +PHP_STATIC_LIBRARY = libphpcpp.a +HHVM_SHARED_LIBRARY = libhhvmcpp.so +HHVM_STATIC_LIBRARY = libhhvmcpp.a # @@ -72,17 +72,17 @@ HHVM_STATIC_LIBRARY = libhhvmcpp.a # ifdef CXX - COMPILER = ${CXX} - LINKER = ${CXX} + COMPILER = ${CXX} + LINKER = ${CXX} else - COMPILER = g++ - LINKER = g++ + COMPILER = g++ + LINKER = g++ endif ifdef AR - ARCHIVER = ${AR} rcs + ARCHIVER = ${AR} rcs else - ARCHIVER = ar rcs + ARCHIVER = ar rcs endif # @@ -97,11 +97,11 @@ endif # you want to leave that flag out on production servers). # -COMPILER_FLAGS = -Wall -c -g -std=c++11 +COMPILER_FLAGS = -Wall -c -g -std=c++11 SHARED_COMPILER_FLAGS = -fpic STATIC_COMPILER_FLAGS = -PHP_COMPILER_FLAGS = ${COMPILER_FLAGS} `${PHP_CONFIG} --includes` -HHVM_COMPILER_FLAGS = ${COMPILER_FLAGS} +PHP_COMPILER_FLAGS = ${COMPILER_FLAGS} `${PHP_CONFIG} --includes` +HHVM_COMPILER_FLAGS = ${COMPILER_FLAGS} # # Linker flags @@ -113,9 +113,9 @@ HHVM_COMPILER_FLAGS = ${COMPILER_FLAGS} # to the linker flags # -LINKER_FLAGS = -shared -PHP_LINKER_FLAGS = ${LINKER_FLAGS} `${PHP_CONFIG} --ldflags` -HHVM_LINKER_FLAGS = ${LINKER_FLAGS} +LINKER_FLAGS = -shared +PHP_LINKER_FLAGS = ${LINKER_FLAGS} `${PHP_CONFIG} --ldflags` +HHVM_LINKER_FLAGS = ${LINKER_FLAGS} # @@ -125,9 +125,9 @@ HHVM_LINKER_FLAGS = ${LINKER_FLAGS} # So you can probably leave this as it is # -RM = rm -fr -CP = cp -f -MKDIR = mkdir -p +RM = rm -fr +CP = cp -f +MKDIR = mkdir -p # @@ -138,9 +138,9 @@ MKDIR = mkdir -p # probably necessary here # -COMMON_SOURCES = $(wildcard common/*.cpp) -PHP_SOURCES = $(wildcard zend/*.cpp) -HHVM_SOURCES = $(wildcard hhvm/*.cpp) +COMMON_SOURCES = $(wildcard common/*.cpp) +PHP_SOURCES = $(wildcard zend/*.cpp) +HHVM_SOURCES = $(wildcard hhvm/*.cpp) # # The object files @@ -151,12 +151,12 @@ HHVM_SOURCES = $(wildcard hhvm/*.cpp) # 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) +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) # |