diff --git a/Makefile b/Makefile index 8a38a689f99f6899d1cf74535248a43f6def86e5..4ad466dae8548f096e36bc6c0416d630ae78e872 100644 --- a/Makefile +++ b/Makefile @@ -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 1e46db11dceca78c63ed243e5fda09f9d14d16cf..1883bd6c2f84ad7a50eccab320170616107d4ae8 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