From a185ca6e0b0ec4495e65d4e46ecc59d8f19286ad Mon Sep 17 00:00:00 2001 From: Olaf Bergmann Date: Thu, 28 Aug 2014 20:54:13 +0200 Subject: [PATCH] add ".project" to GITIGNOREDS in Makefile and updated .gitignore --- .gitignore | 1 + Makefile.in | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b224333..589e947 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ dtls_config.h *.wismote *.z1 *.z1sp +.project diff --git a/Makefile.in b/Makefile.in index d56fc51..c3ee897 100644 --- a/Makefile.in +++ b/Makefile.in @@ -63,15 +63,6 @@ LDFLAGS:=@LIBS@ ARFLAGS:=cru doc:=doc -# files that should be ignored by git -GITIGNOREDS:= core \*~ \*.[oa] \*.gz \*.cap \*.pcap Makefile \ - autom4te.cache/ config.h config.log config.status configure \ - doc/Doxyfile doc/doxygen.out doc/html/ $(LIB) tests/ccm-test \ - tests/dtls-client tests/dtls-server tests/prf-test $(package) \ - $(DISTDIR)/ TAGS \*.patch .gitignore ecc/testecc ecc/testfield \ - \*.d \*.hex \*.elf \*.map obj_\* tinydtls.h dtls_config.h \ - $(addprefix \*., $(notdir $(wildcard ../../platform/*))) - .PHONY: all dirs clean install dist distclean .gitignore doc TAGS .SUFFIXES: @@ -134,6 +125,16 @@ TAGS: $(ETAGS) -a -o $@.new $(HEADERS) mv $@.new $@ +# files that should be ignored by git +GITIGNOREDS:= core \*~ \*.[oa] \*.gz \*.cap \*.pcap Makefile \ + autom4te.cache/ config.h config.log config.status configure \ + doc/Doxyfile doc/doxygen.out doc/html/ $(LIB) tests/ccm-test \ + tests/dtls-client tests/dtls-server tests/prf-test $(package) \ + $(DISTDIR)/ TAGS \*.patch .gitignore ecc/testecc ecc/testfield \ + \*.d \*.hex \*.elf \*.map obj_\* tinydtls.h dtls_config.h \ + $(addprefix \*., $(notdir $(wildcard ../../platform/*))) \ + .project + .gitignore: echo $(GITIGNOREDS) | sed 's/ /\n/g' > $@