diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-08-04 16:16:39 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-08-04 16:16:39 -0700 |
| commit | 80aecf609b54aeb0677461cae771362b5affe173 (patch) | |
| tree | 83ab367c27e5d76ca1d3707fa72496bd7a3750e9 | |
| parent | eb3be09cbd96c0fa75845b7f111d49c6241c30a9 (diff) | |
| parent | 2ed6878412d54ad1a6509de45d6351a3f697bb48 (diff) | |
Merge pull request #2787 from nicolasnoble/no-pkgconfig-is-broken
Fixing environments where pkg-config isn't installed.
| -rw-r--r-- | Makefile | 62 | ||||
| -rw-r--r-- | templates/Makefile.template | 62 |
2 files changed, 82 insertions, 42 deletions
@@ -268,34 +268,21 @@ INCLUDES = . include $(GENDIR) LDFLAGS += -Llibs/$(CONFIG) ifeq ($(SYSTEM),Darwin) -ifneq ($(wildcard /usr/local/ssl/include),) -INCLUDES += /usr/local/ssl/include -endif -ifneq ($(wildcard /opt/local/include),) -INCLUDES += /opt/local/include -endif -ifneq ($(wildcard /usr/local/include),) -INCLUDES += /usr/local/include -endif -LIBS = m z -ifneq ($(wildcard /usr/local/ssl/lib),) -LDFLAGS += -L/usr/local/ssl/lib -endif -ifneq ($(wildcard /opt/local/lib),) -LDFLAGS += -L/opt/local/lib -endif -ifneq ($(wildcard /usr/local/lib),) -LDFLAGS += -L/usr/local/lib -endif +LIBS += m endif ifeq ($(SYSTEM),Linux) -LIBS = rt m z pthread +LIBS += rt m pthread LDFLAGS += -pthread endif ifeq ($(SYSTEM),MINGW32) -LIBS = m z pthread +LIBS += m pthread +LDFLAGS += -pthread +endif + +ifeq ($(SYSTEM),FreeBSD) +LIBS += pthread LDFLAGS += -pthread endif @@ -387,6 +374,39 @@ ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.0.0-alpha-3 protobuf else # HAS_PKG_CONFIG +ifeq ($(SYSTEM),Darwin) +ifneq ($(wildcard /usr/local/ssl/include),) +INCLUDES += /usr/local/ssl/include +endif +ifneq ($(wildcard /opt/local/include),) +INCLUDES += /opt/local/include +endif +ifneq ($(wildcard /usr/local/include),) +INCLUDES += /usr/local/include +endif +ifneq ($(wildcard /usr/local/ssl/lib),) +LDFLAGS += -L/usr/local/ssl/lib +endif +ifneq ($(wildcard /opt/local/lib),) +LDFLAGS += -L/opt/local/lib +endif +ifneq ($(wildcard /usr/local/lib),) +LDFLAGS += -L/usr/local/lib +endif +endif + +ifeq ($(SYSTEM),Linux) +LIBS += z +endif + +ifeq ($(SYSTEM),MINGW32) +LIBS += z +endif + +ifeq ($(SYSTEM),FreeBSD) +LIBS += z +endif + ifeq ($(SYSTEM),MINGW32) OPENSSL_LIBS = ssl32 eay32 else diff --git a/templates/Makefile.template b/templates/Makefile.template index 6530ea5eb2..2670e1b1d7 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -282,34 +282,21 @@ INCLUDES = . include $(GENDIR) LDFLAGS += -Llibs/$(CONFIG) ifeq ($(SYSTEM),Darwin) -ifneq ($(wildcard /usr/local/ssl/include),) -INCLUDES += /usr/local/ssl/include -endif -ifneq ($(wildcard /opt/local/include),) -INCLUDES += /opt/local/include -endif -ifneq ($(wildcard /usr/local/include),) -INCLUDES += /usr/local/include -endif -LIBS = m z -ifneq ($(wildcard /usr/local/ssl/lib),) -LDFLAGS += -L/usr/local/ssl/lib -endif -ifneq ($(wildcard /opt/local/lib),) -LDFLAGS += -L/opt/local/lib -endif -ifneq ($(wildcard /usr/local/lib),) -LDFLAGS += -L/usr/local/lib -endif +LIBS += m endif ifeq ($(SYSTEM),Linux) -LIBS = rt m z pthread +LIBS += rt m pthread LDFLAGS += -pthread endif ifeq ($(SYSTEM),MINGW32) -LIBS = m z pthread +LIBS += m pthread +LDFLAGS += -pthread +endif + +ifeq ($(SYSTEM),FreeBSD) +LIBS += pthread LDFLAGS += -pthread endif @@ -412,6 +399,39 @@ ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.0.0-alpha-3 protobuf else # HAS_PKG_CONFIG +ifeq ($(SYSTEM),Darwin) +ifneq ($(wildcard /usr/local/ssl/include),) +INCLUDES += /usr/local/ssl/include +endif +ifneq ($(wildcard /opt/local/include),) +INCLUDES += /opt/local/include +endif +ifneq ($(wildcard /usr/local/include),) +INCLUDES += /usr/local/include +endif +ifneq ($(wildcard /usr/local/ssl/lib),) +LDFLAGS += -L/usr/local/ssl/lib +endif +ifneq ($(wildcard /opt/local/lib),) +LDFLAGS += -L/opt/local/lib +endif +ifneq ($(wildcard /usr/local/lib),) +LDFLAGS += -L/usr/local/lib +endif +endif + +ifeq ($(SYSTEM),Linux) +LIBS += z +endif + +ifeq ($(SYSTEM),MINGW32) +LIBS += z +endif + +ifeq ($(SYSTEM),FreeBSD) +LIBS += z +endif + ifeq ($(SYSTEM),MINGW32) OPENSSL_LIBS = ssl32 eay32 else |