Skip to content
Snippets Groups Projects
Commit 51b49796 authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

Merge pull request #693 from nicolasnoble/regen-makefile

Regenerated outdated Makefile.
parents dd11207b 1c0542fd
No related branches found
No related tags found
No related merge requests found
...@@ -1915,7 +1915,7 @@ $(OBJDIR)/$(CONFIG)/%.o : %.cc ...@@ -1915,7 +1915,7 @@ $(OBJDIR)/$(CONFIG)/%.o : %.cc
$(Q) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $< $(Q) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
   
   
install: install_c install_cxx install-protobuf install-plugins install: install_c install_cxx install-plugins
   
install_c: install-headers_c install-static_c install-shared_c install_c: install-headers_c install-static_c install-shared_c
   
...@@ -2046,17 +2046,6 @@ endif ...@@ -2046,17 +2046,6 @@ endif
endif endif
   
   
install-protobuf: $(PROTOBUF_DEP)
ifneq ($(PROTOBUF_DEP),)
$(E) "[INSTALL] Installing embedded protobufs"
$(Q) $(MAKE) -C third_party/protobuf install prefix=$(prefix)
ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin)
$(Q) ldconfig || true
endif
endif
endif
install-plugins: $(PROTOC_PLUGINS) install-plugins: $(PROTOC_PLUGINS)
ifeq ($(SYSTEM),MINGW32) ifeq ($(SYSTEM),MINGW32)
$(Q) false $(Q) false
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment