diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-09-20 10:28:13 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-09-20 10:28:13 -0400 |
| commit | f2b066da7098703610371cce9649af22bd5fee5b (patch) | |
| tree | f85d820b0c3022b8629a8d97e601e192b5ff95bb | |
| parent | bfc24bd4cee1c1da944dfd1f236b07e9194f493c (diff) | |
Update gitignore and Makefiles for build.h move from src/ to src/obj
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | src/makefile.linux-mingw | 2 | ||||
| -rw-r--r-- | src/makefile.mingw | 1 | ||||
| -rw-r--r-- | src/makefile.osx | 2 | ||||
| -rw-r--r-- | src/makefile.unix | 2 |
5 files changed, 3 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 2b70e2cca5..95152ce4fb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ src/*.exe src/bitcoin src/bitcoind src/test_bitcoin -src/build.h .*.swp *.*~* *.bak diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 4ba0cf06f0..2804f14055 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -111,6 +111,6 @@ clean: -rm -f bitcoind.exe -rm -f obj-test/*.o -rm -f test_bitcoin.exe - -rm -f src/build.h + -rm -f obj/build.h FORCE: diff --git a/src/makefile.mingw b/src/makefile.mingw index 9bbd739365..5cb2c84f4d 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -104,6 +104,5 @@ clean: -del /Q bitcoind test_bitcoin -del /Q obj\* -del /Q obj-test\* - -del /Q build.h FORCE: diff --git a/src/makefile.osx b/src/makefile.osx index 547f751aba..359739bd5e 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -156,6 +156,6 @@ clean: -rm -f obj-test/*.o -rm -f obj/*.P -rm -f obj-test/*.P - -rm -f src/build.h + -rm -f obj/build.h FORCE: diff --git a/src/makefile.unix b/src/makefile.unix index 6f8f96e3af..a41b57b4fc 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -172,6 +172,6 @@ clean: -rm -f obj-test/*.o -rm -f obj/*.P -rm -f obj-test/*.P - -rm -f src/build.h + -rm -f obj/build.h FORCE: |