summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-08-03 05:51:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:31:04 -0500
commitdb28a320edb7cd3a24133f1054bb74c445388289 (patch)
tree550277b30a71e1504bf867099d267dfa996629a5
parentc829871308ffeadf04ca96f595d839e96ba3a926 (diff)
downloadsamba-db28a320edb7cd3a24133f1054bb74c445388289.tar.gz
samba-db28a320edb7cd3a24133f1054bb74c445388289.tar.bz2
samba-db28a320edb7cd3a24133f1054bb74c445388289.zip
r8991: Change Makefile.core to main.mk to prevent accidental removal problems.
(This used to be commit 3719570411c47b019e29dbfec1af7b018ea9f759)
-rw-r--r--source4/build/smb_build/main.pl2
-rw-r--r--source4/main.mk (renamed from source4/Makefile.core)0
2 files changed, 1 insertions, 1 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 0b79b7c4b4..7f83754408 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -18,7 +18,7 @@ use strict;
my $INPUT = {};
-my $mkfile = config_mk::run_config_mk($INPUT, "Makefile.core");
+my $mkfile = config_mk::run_config_mk($INPUT, "main.mk");
my $DEPEND = smb_build::input::check($INPUT, \%config::enabled);
my $OUTPUT = output::create_output($DEPEND);
makefile::create_makefile_in($OUTPUT, $mkfile, "Makefile.in");
diff --git a/source4/Makefile.core b/source4/main.mk
index 5f417b4624..5f417b4624 100644
--- a/source4/Makefile.core
+++ b/source4/main.mk