Skip to content

Commit

Permalink
MB-6128: Don't build libcbio anymore
Browse files Browse the repository at this point in the history
Change-Id: I69b08246fb04c0c5b891ed7f60c07d79ff73aad5
Reviewed-on: http://review.couchbase.org/19302
Tested-by: Trond Norbye <trond.norbye@gmail.com>
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
  • Loading branch information
trondn authored and alk committed Aug 6, 2012
1 parent d6cc7ea commit 79b0a43
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions Makefile.top
Expand Up @@ -6,7 +6,6 @@ COMPONENTS := $(COMPONENTS_EXTRA) \
bucket_engine \
couchstore \
ep-engine \
libcbio \
libconflate \
libmemcached \
libvbucket \
Expand Down Expand Up @@ -181,15 +180,10 @@ memcachetest_EXTRA_MAKE_OPTIONS := 'CPPFLAGS=-I$(TOPDIR)/memcached/include -I$(T
deps-for-memcachetest: make-install-memcached make-install-libmemcached make-install-libvbucket

ep-engine_OPTIONS := --with-memcached=../memcached $(WITH_DEBUG_FLAG)
deps-for-ep-engine: make-install-memcached make-install-libcbio
deps-for-ep-engine: make-install-memcached make-install-couchstore

couchstore_OPTIONS := $(LIBRARY_OPTIONS) $(WITH_DEBUG_FLAG)

libcbio_OPTIONS := $(LIBRARY_OPTIONS) $(WITH_DEBUG_FLAG) \
'LDFLAGS=-L$(DESTDIR)$(PREFIX)/lib $(LDFLAGS)' \
'CPPFLAGS=-I$(DESTDIR)$(PREFIX)/include $(CPPFLAGS)'
deps-for-libcbio: make-install-couchstore

bucket_engine_OPTIONS := $(WITH_DEBUG_FLAG) \
'CPPFLAGS=-I$(DESTDIR)$(PREFIX)/include $(CPPFLAGS)'
deps-for-bucket_engine: make-install-memcached make-install-ep-engine
Expand Down

0 comments on commit 79b0a43

Please sign in to comment.