From d0b5985cb7b7bd33d46b280f5b8a1098d1dcf131 Mon Sep 17 00:00:00 2001 From: Al Date: Mon, 28 Dec 2015 16:56:10 -0500 Subject: [PATCH] [build] Adding /usr/local/lib and /usr/local/include to sparkey build --- src/Makefile.am | 5 ++--- src/sparkey/Makefile.am | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3f0a6b24..3228f1d4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,11 +1,10 @@ SUBDIRS = sparkey -CFLAGS_BASE = -Wfloat-equal -Wpointer-arith +CFLAGS_BASE = -I.. -I/usr/local/include -Wfloat-equal -Wpointer-arith CFLAGS_O0 = $(CFLAGS_BASE) -O0 CFLAGS_O1 = $(CFLAGS_BASE) -O1 CFLAGS_O2 = $(CFLAGS_BASE) -O2 CFLAGS_O3 = $(CFLAGS_BASE) -O3 -DEFAULT_INCLUDES=-I.. CFLAGS = $(CFLAGS_BASE) @@ -19,7 +18,7 @@ dist_bin_SCRIPTS = libpostal_data # Scanner can take a very long time to compile with higher optimization levels, so always use -O0, scanner is fast enough noinst_LTLIBRARIES = libscanner.la libscanner_la_SOURCES = scanner.c -libscanner_la_CFLAGS = $(CFLAGS_O0) +libscanner_la_CFLAGS = $(CFLAGS_O0) noinst_PROGRAMS = libpostal bench build_address_dictionary build_geodb build_numex_table build_trans_table address_parser_train address_parser_test address_parser libpostal_SOURCES = main.c json_encode.c diff --git a/src/sparkey/Makefile.am b/src/sparkey/Makefile.am index fafa4c18..6e5012cd 100644 --- a/src/sparkey/Makefile.am +++ b/src/sparkey/Makefile.am @@ -1,4 +1,3 @@ -CFLAGS = -O2 -Wall -Wextra -Wfloat-equal -Wshadow -Wpointer-arith -Werror -pedantic noinst_LTLIBRARIES = libsparkey.la libsparkey_la_SOURCES = endiantools.h hashheader.h logheader.h \ @@ -6,4 +5,6 @@ MurmurHash3.h buf.c hashalgorithms.c hashiter.c hashwriter.c \ logreader.c returncodes.c util.c buf.h hashalgorithms.h hashiter.h \ sparkey.h util.h endiantools.c \ hashheader.c hashreader.c logheader.c logwriter.c MurmurHash3.c \ -sparkey-internal.h \ No newline at end of file +sparkey-internal.h +libsparkey_la_CFLAGS = -I/usr/local/include -O2 -Wall -Wextra -Wfloat-equal -Wshadow -Wpointer-arith -Werror -pedantic +libsparkey_la_LDFLAGS = -L/usr/local/lib \ No newline at end of file