Merge branch 'master' of git+ssh://openadk.org/git/openadk

1 files changed, 28 insertions, 21 deletions

diff --git a/.gitignore b/.gitignore
index fc81d7882..3ac956900 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,30 @@
-/config/conf
-/config/conf.exe
-/config/a.exe
-/config/lex.backup
-/config/lex.zconf.c
-/config/lkc_defs.h
-/config/gconf
-/config/gconf.exe
-/config/mconf
-/config/mconf.exe
-/config/zconf.hash.c
-/config/zconf.output
-/config/zconf.tab.c
-/config/zconf.tab.h
-/tests/master.exp
-/tests/adk.exp
-/tests/adk.exp.in.tmp
+/adk/config/*.o
+/adk/config/lxdialog/*.o
+/adk/config/conf
+/adk/config/conf.exe
+/adk/config/a.exe
+/adk/config/lex.backup
+/adk/config/lex.zconf.c
+/adk/config/lkc_defs.h
+/adk/config/gconf
+/adk/config/gconf.exe
+/adk/config/mconf
+/adk/config/mconf.exe
+/adk/config/zconf.hash.c
+/adk/config/zconf.output
+/adk/config/zconf.tab.c
+/adk/config/zconf.tab.h
+/adk/tools/pkgmaker
+/adk/tools/depmaker
+/adk/tools/pkgrebuild
+/adk/tools/depmaker.dSYM/
+/adk/tools/pkgmaker.dSYM/
+/adk/tools/pkgrebuild.dSYM/
+/adk/tests/master.exp
+/adk/tests/adk.exp
+/adk/tests/adk.exp.in.tmp
 /prereq.mk
-/toolchain_build_*/
+/toolchain_*/
 /.ADK_HAVE_DOT_CONFIG
 /.tmpconfig.h
 /.prereq_done
@@ -32,8 +40,6 @@
 /root_*/
 /firmware/
 /build_*/
-/config/*.o
-/config/lxdialog/*.o
 /make.log
 /dl
 /package/Config.in.auto*
@@ -41,7 +47,6 @@
 /package/*/Config.in
 /package/*/Config.in.lib
 /package/*/Config.in.kmod
-/tools_build/
 /extra/
 /.menu
 /.adkinit
@@ -53,3 +58,5 @@
 /target/config/Config.in.system
 /target/config/Config.in.native
 /target/config/Config.in.arch
+/target/config/Config.in.prereq
+/target/m68k/aranym.cfg