summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-15 14:56:46 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-15 14:56:46 +0200
commitb8e8e9f0a58bf2d8c3f6fb6b29ff5e86f19b7a3a (patch)
tree5de29f22ddbe9a1e0a662e7e37388a99d2f49d4c
parent99d4af748f92396d47609fffaff7b1168897a5e9 (diff)
downloadsamba-b8e8e9f0a58bf2d8c3f6fb6b29ff5e86f19b7a3a.tar.gz
samba-b8e8e9f0a58bf2d8c3f6fb6b29ff5e86f19b7a3a.tar.bz2
samba-b8e8e9f0a58bf2d8c3f6fb6b29ff5e86f19b7a3a.zip
Ignore generated build files.
-rw-r--r--.gitignore2
-rw-r--r--source3/Makefile.in4
-rw-r--r--source3/samba4.m44
3 files changed, 6 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index b72ebe63a7..59bedaaa5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,6 +107,8 @@ source3/smbd/build_options.c
source3/st
source3/tags
source3/TAGS
+source3/samba4-data.mk
+source3/samba4-config.mk
source3/torture.tdb
source4/apidocs
source4/auth/auth_proto.h
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 51103ffc49..31387c315c 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2622,10 +2622,10 @@ include/build_env.h: script/build_env.sh
proto::
-etags:
+etags::
etags `find $(srcdir) -name "*.[ch]"`
-ctags:
+ctags::
ctags `find $(srcdir) -name "*.[ch]"`
realclean:: clean
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 04f88950ff..470a5a415f 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -120,8 +120,8 @@ AC_OUTPUT_COMMANDS([
cd ${srcdir}/../source4
USESHARED=false $PERL -I${builddir} -I${builddir}/build \
-I. -Ibuild \
- build/smb_build/main.pl --output=../../source/samba4-data.mk main.mk || exit $?
-cd ../../source
+ build/smb_build/main.pl --output=../source3/samba4-data.mk main.mk || exit $?
+cd ../source3
],[
srcdir="$srcdir"
builddir="$builddir"