add ".project" to GITIGNOREDS in Makefile and updated .gitignore

unuseid · Aug 28, 2014 · a185ca6 · a185ca6
1 parent ff88c72
commit a185ca6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -61,3 +61,4 @@ dtls_config.h
 *.wismote
 *.z1
 *.z1sp
+.project
diff --git 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' > $@
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,3 +61,4 @@ dtls_config.h @@
     *.wismote
     *.z1
     *.z1sp
+    .project