summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-11 01:42:29 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-11 01:42:29 +0100
commit105c6fec24c0775fde548c32d87b7e482a0edff3 (patch)
treee57b8d7dfe60aae1cfd317fd5d13d25d491e64a6 /.gitignore
parentb090c021661429259aad6d7bcc6ec8df7f680b43 (diff)
downloadsamba-105c6fec24c0775fde548c32d87b7e482a0edff3.tar.gz
samba-105c6fec24c0775fde548c32d87b7e482a0edff3.tar.bz2
samba-105c6fec24c0775fde548c32d87b7e482a0edff3.zip
Avoid autogenerating the Makefile but rather include a data.mk file
that is autogenerated. (This used to be commit 95967e8bfbdce2e073a3fc938f1271da40b543d3)
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index a85553dc49..7a093f5205 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@ autom4te.cache
*.hd
*.ho
*.pyc
-Makefile
configure
source/bin/*
config.log
@@ -195,3 +194,5 @@ source/libcli/ldap/ldap_ndr.h
source/libcli/resolve/lp_proto.h
source/apidocs
*.swp
+source/mkconfig.mk
+source/data.mk