Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' 

Conflicts:
	.gitignore
This commit is contained in:
Frank Celler 2012-02-20 11:16:05 +01:00
parent c4be4b3b8f d4233e40be
commit e0d146646e
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -53,3 +53,4 @@ config.h
out out
3rdParty/libev/ARCH.x64 3rdParty/libev/ARCH.x64
.v8-build .v8-build
.libev-build

6
Makefile.all-in-one
View File

@ -22,7 +22,9 @@ endif
BUILT_SOURCES += @LIBEV_LIBS@ BUILT_SOURCES += @LIBEV_LIBS@
@LIBEV_LIBS@: @LIBEV_LIBS@: .libev-build
.libev-build:
@echo @echo
@echo "--------------------------------------------------------------------------------" @echo "--------------------------------------------------------------------------------"
@echo "BUILDING LIBEV" @echo "BUILDING LIBEV"
@ -33,6 +35,8 @@ BUILT_SOURCES += @LIBEV_LIBS@
cd @top_srcdir@/3rdParty/libev/$(LIBEV_BUILD_VERSION) && CFLAGS="$(LIBEV_CFLAGS_32)" orig_CFLAGS="$(LIBEV_CFLAGS_32)" LDFLAGS="$(LIBEV_LDFLAGS_32)" ../configure --disable-shared cd @top_srcdir@/3rdParty/libev/$(LIBEV_BUILD_VERSION) && CFLAGS="$(LIBEV_CFLAGS_32)" orig_CFLAGS="$(LIBEV_CFLAGS_32)" LDFLAGS="$(LIBEV_LDFLAGS_32)" ../configure --disable-shared
cd @top_srcdir@/3rdParty/libev/$(LIBEV_BUILD_VERSION) && make cd @top_srcdir@/3rdParty/libev/$(LIBEV_BUILD_VERSION) && make
touch .libev-build
@echo @echo
@echo "--------------------------------------------------------------------------------" @echo "--------------------------------------------------------------------------------"
@echo "BUILD LIBEV FINISHED" @echo "BUILD LIBEV FINISHED"

6
Makefile.in
View File

@ -5309,7 +5309,9 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-directories
@ENABLE_BISON_TRUE@JsonParserX/%.cpp: @srcdir@/JsonParserX/%.yy @ENABLE_BISON_TRUE@JsonParserX/%.cpp: @srcdir@/JsonParserX/%.yy
@ENABLE_BISON_TRUE@ @top_srcdir@/config/bison-c++.sh $(BISON) $@ $< @ENABLE_BISON_TRUE@ @top_srcdir@/config/bison-c++.sh $(BISON) $@ $<
@ENABLE_ALL_IN_ONE_TRUE@@LIBEV_LIBS@: @ENABLE_ALL_IN_ONE_TRUE@@LIBEV_LIBS@: .libev-build
@ENABLE_ALL_IN_ONE_TRUE@.libev-build:
@ENABLE_ALL_IN_ONE_TRUE@ @echo @ENABLE_ALL_IN_ONE_TRUE@ @echo
@ENABLE_ALL_IN_ONE_TRUE@ @echo "--------------------------------------------------------------------------------" @ENABLE_ALL_IN_ONE_TRUE@ @echo "--------------------------------------------------------------------------------"
@ENABLE_ALL_IN_ONE_TRUE@ @echo "BUILDING LIBEV" @ENABLE_ALL_IN_ONE_TRUE@ @echo "BUILDING LIBEV"
@ -5320,6 +5322,8 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-directories
@ENABLE_ALL_IN_ONE_TRUE@ cd @top_srcdir@/3rdParty/libev/$(LIBEV_BUILD_VERSION) && CFLAGS="$(LIBEV_CFLAGS_32)" orig_CFLAGS="$(LIBEV_CFLAGS_32)" LDFLAGS="$(LIBEV_LDFLAGS_32)" ../configure --disable-shared @ENABLE_ALL_IN_ONE_TRUE@ cd @top_srcdir@/3rdParty/libev/$(LIBEV_BUILD_VERSION) && CFLAGS="$(LIBEV_CFLAGS_32)" orig_CFLAGS="$(LIBEV_CFLAGS_32)" LDFLAGS="$(LIBEV_LDFLAGS_32)" ../configure --disable-shared
@ENABLE_ALL_IN_ONE_TRUE@ cd @top_srcdir@/3rdParty/libev/$(LIBEV_BUILD_VERSION) && make @ENABLE_ALL_IN_ONE_TRUE@ cd @top_srcdir@/3rdParty/libev/$(LIBEV_BUILD_VERSION) && make
@ENABLE_ALL_IN_ONE_TRUE@ touch .libev-build
@ENABLE_ALL_IN_ONE_TRUE@ @echo @ENABLE_ALL_IN_ONE_TRUE@ @echo
@ENABLE_ALL_IN_ONE_TRUE@ @echo "--------------------------------------------------------------------------------" @ENABLE_ALL_IN_ONE_TRUE@ @echo "--------------------------------------------------------------------------------"
@ENABLE_ALL_IN_ONE_TRUE@ @echo "BUILD LIBEV FINISHED" @ENABLE_ALL_IN_ONE_TRUE@ @echo "BUILD LIBEV FINISHED"