Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge github.com:grpc/grpc into primary-goat-whisperer

Browse Source
pull/2732/head
Craig Tiller 9 years ago
parent 6fa0b98206 3bbacf1b5e
commit a0cfd1cb61
2 changed files with 42 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 62
      Makefile
  2. 62
      templates/Makefile.template

62
Makefile
Unescape View File

@ -268,21 +268,34 @@ INCLUDES = . include $(GENDIR)
LDFLAGS += -Llibs/$(CONFIG) LDFLAGS += -Llibs/$(CONFIG)
ifeq ($(SYSTEM),Darwin) ifeq ($(SYSTEM),Darwin)
LIBS += m 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
endif endif
ifeq ($(SYSTEM),Linux) ifeq ($(SYSTEM),Linux)
LIBS += rt m pthread LIBS = rt m z pthread
LDFLAGS += -pthread LDFLAGS += -pthread
endif endif
ifeq ($(SYSTEM),MINGW32) ifeq ($(SYSTEM),MINGW32)
LIBS += m pthread LIBS = m z pthread
LDFLAGS += -pthread
endif
ifeq ($(SYSTEM),FreeBSD)
LIBS += pthread
LDFLAGS += -pthread LDFLAGS += -pthread
endif endif
@ -374,39 +387,6 @@ ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib
PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.0.0-alpha-3 protobuf PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.0.0-alpha-3 protobuf
else # HAS_PKG_CONFIG 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) ifeq ($(SYSTEM),MINGW32)
OPENSSL_LIBS = ssl32 eay32 OPENSSL_LIBS = ssl32 eay32
else else

62
templates/Makefile.template
Unescape View File

@ -282,21 +282,34 @@ INCLUDES = . include $(GENDIR)
LDFLAGS += -Llibs/$(CONFIG) LDFLAGS += -Llibs/$(CONFIG)
ifeq ($(SYSTEM),Darwin) ifeq ($(SYSTEM),Darwin)
LIBS += m 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
endif endif
ifeq ($(SYSTEM),Linux) ifeq ($(SYSTEM),Linux)
LIBS += rt m pthread LIBS = rt m z pthread
LDFLAGS += -pthread LDFLAGS += -pthread
endif endif
ifeq ($(SYSTEM),MINGW32) ifeq ($(SYSTEM),MINGW32)
LIBS += m pthread LIBS = m z pthread
LDFLAGS += -pthread
endif
ifeq ($(SYSTEM),FreeBSD)
LIBS += pthread
LDFLAGS += -pthread LDFLAGS += -pthread
endif endif
@ -399,39 +412,6 @@ ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib
PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.0.0-alpha-3 protobuf PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.0.0-alpha-3 protobuf
else # HAS_PKG_CONFIG 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) ifeq ($(SYSTEM),MINGW32)
OPENSSL_LIBS = ssl32 eay32 OPENSSL_LIBS = ssl32 eay32
else else

Write Preview
Loading…
Cancel
Save