Created
November 11, 2013 20:44
-
-
Save dakcarto/7420023 to your computer and use it in GitHub Desktop.
Fix to statically link internal custom dependencies, instead of creating .dylibs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/third_party/Makefile.am b/third_party/Makefile.am | |
index 571c240..5512a77 100644 | |
--- a/third_party/Makefile.am | |
+++ b/third_party/Makefile.am | |
@@ -5,15 +5,15 @@ AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \ | |
-I$(top_srcdir)/third_party/googletest-r108 \ | |
-I$(top_srcdir)/third_party/googletest-r108/include | |
-lib_LTLIBRARIES = libminizip.la liburiparser.la | |
-noinst_LTLIBRARIES = libgtest.la libgtest_main.la | |
+lib_LTLIBRARIES = | |
+noinst_LTLIBRARIES = libgtest.la libgtest_main.la libminizip.la liburiparser.la | |
libminizip_la_SOURCES = \ | |
zlib-1.2.3/contrib/minizip/unzip.c \ | |
zlib-1.2.3/contrib/minizip/ioapi.c \ | |
zlib-1.2.3/contrib/minizip/iomem_simple.c \ | |
zlib-1.2.3/contrib/minizip/zip.c | |
-libminizip_la_LDFLAGS = -lz | |
+libminizip_la_LDFLAGS = -static -lz | |
liburiparser_la_SOURCES = \ | |
$(uriparser)/lib/UriCommon.c \ | |
@@ -34,7 +34,7 @@ liburiparser_la_SOURCES = \ | |
$(uriparser)/lib/UriRecompose.c \ | |
$(uriparser)/lib/UriResolve.c \ | |
$(uriparser)/lib/UriShorten.c | |
-liburiparser_la_LDFLAGS = -version-info 1:5:0 | |
+liburiparser_la_LDFLAGS = -static -version-info 1:5:0 | |
boost_root = boost_1_34_1 | |
boost = $(boost_root)/boost |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment