From 9bebd4dce963d8d7230f7baef41428acca3aa087 Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Fri, 12 Feb 2016 17:29:36 +0100 Subject: [PATCH] Problem: local build should do its own .gitignore Solution: add .gitignore in builds/gyp --- .gitignore | 4 ---- builds/gyp/.gitignore | 5 +++++ builds/gyp/project.gyp | 7 +++---- 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 builds/gyp/.gitignore diff --git a/.gitignore b/.gitignore index 53a23470..899ad9f1 100644 --- a/.gitignore +++ b/.gitignore @@ -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/ diff --git a/builds/gyp/.gitignore b/builds/gyp/.gitignore new file mode 100644 index 00000000..9cd51481 --- /dev/null +++ b/builds/gyp/.gitignore @@ -0,0 +1,5 @@ +project.Makefile +*.mk +out/ +Makefile + diff --git a/builds/gyp/project.gyp b/builds/gyp/project.gyp index ed78fde5..f8323a0c 100644 --- a/builds/gyp/project.gyp +++ b/builds/gyp/project.gyp @@ -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'