Problem: local build should do its own .gitignore

Solution: add .gitignore in builds/gyp
This commit is contained in:
Pieter Hintjens 2016-02-12 17:29:36 +01:00
parent 8559770cf3
commit 9bebd4dce9
3 changed files with 8 additions and 8 deletions

4
.gitignore vendored
View File

@ -22,7 +22,6 @@ autom4te.cache
*.html
*.pdf
*.ps
.*
*~
.*~
curve_keygen
@ -170,6 +169,3 @@ zeromq-*.zip
core
build
test-suite.log
project.Makefile
libzmq.target.mk
out/

5
builds/gyp/.gitignore vendored Normal file
View File

@ -0,0 +1,5 @@
project.Makefile
*.mk
out/
Makefile

View File

@ -5,7 +5,6 @@
#
# gyp --depth=. --format=make
# make
#
{
'includes': [
'project-tests.gypi',
@ -21,7 +20,7 @@
'conditions': [
[ 'OS=="win"', {
'defines': [
'ZMQ_HAVE_WINDOWS=1',
'ZMQ_HAVE_WINDOWS',
'ZMQ_STATIC',
'FD_SETSIZE=16384',
'_CRT_SECURE_NO_WARNINGS'
@ -34,12 +33,12 @@
}],
[ 'OS=="mac"', {
'defines': [
'ZMQ_HAVE_OSX=1'
'ZMQ_HAVE_OSX'
]
}],
[ 'OS=="linux"', {
'defines': [
'ZMQ_HAVE_LINUX=1'
'ZMQ_HAVE_LINUX'
],
'libraries': [
'-lpthread'