Permalink
Browse files

Stop building libcurl -- annoyingly it puts more dependencies on the …

…build than does just relying on the presence of libcurl itself
  • Loading branch information...
1 parent ebef84c commit 913e0d58fca851e46629a6a71138ea58ac3c495a @alamb alamb committed Jun 11, 2012
@@ -18,15 +18,15 @@ THIRD_PARTY_LIB = build/lib
# Add in your source files below
BUILD_FILES = build/Vertica.o \
- $(addprefix build/,TwitterSentiment.o lib/libstemmer.o lib/libcurl.a lib/libjson.a)
+ $(addprefix build/,TwitterSentiment.o lib/libstemmer.o lib/libjson.a)
# Define the .so name here (and update the references in ddl/install.sql and ddl/uninstall.sql)
PACKAGE_LIBNAME = lib/TwitterSentiment.so
CXX=g++
CXXFLAGS=-g -c -I ../include -Wall -Wno-unused-value -fPIC -I $(VERTICA_SDK_INCLUDE) -I $(THIRD_PARTY_INCLUDE)
#LDFLAGS=-shared -L $(THIRD_PARTY_LIB) -Wl,-Bstatic -luriparser -Wl,-Bstatic -lpcre -Wl,-Bdynamic
-LDFLAGS=-shared -L $(THIRD_PARTY_LIB) -lidn -lssl -lcrypto -lrt -lssl -lcrypto -ldl -lz -lz
+LDFLAGS=-shared -L $(THIRD_PARTY_LIB) -lcurl -lidn -lssl -lcrypto -lrt -lssl -lcrypto -ldl -lz -lz
# add optimization if not a debug build
# (make DEBUG=true" will make a non-optimized build)
Binary file not shown.
@@ -10,7 +10,7 @@ INSTALL_DIR = $(THIRD_PARTY)/../../build
PYTHON=python
.PHONY: all
-all: stemmer jsoncpp libcurl
+all: stemmer jsoncpp
.PHONY: stemmer
stemmer:
@@ -33,16 +33,7 @@ jsoncpp-src-0.5.0/.done:
@cp -r jsoncpp-src-0.5.0/include//* $(INSTALL_DIR)/include
touch $@
-.PHONY: libcurl
-libcurl: curl-7.23.1/.done
-curl-7.23.1/.done:
- mkdir -p $(INSTALL_DIR)
- @echo "Unpacking, configuring and installing libcurl...";
- $(TAR) xzf curl-7.23.1.tar.gz
- (cd curl-7.23.1; ./configure --prefix=$(INSTALL_DIR) --enable-shared=no)
- (cd curl-7.23.1; make; make install)
- touch $@
clean:
cd libstemmer_c; $(MAKE) clean

0 comments on commit 913e0d5

Please sign in to comment.