From fdef91b4848e9983069e74f5648a35e8d90e04c6 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 9 Feb 2008 16:23:02 +0100 Subject: Move more make code to rules.mk (This used to be commit 5ade1a951685665164037138cb92e5b2db2a8b52) --- source4/main.mk | 25 +++---------------------- source4/rules.mk | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 22 deletions(-) (limited to 'source4') diff --git a/source4/main.mk b/source4/main.mk index c4f1806e80..769cc4f1e4 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -73,24 +73,8 @@ showlayout:: @echo ' winbindd_socket_dir: $(WINBINDD_SOCKET_DIR)' showflags:: - @echo 'Samba will be compiled with flags:' - @echo ' CPP = $(CPP)' - @echo ' CPPFLAGS = $(CPPFLAGS)' - @echo ' CC = $(CC)' - @echo ' CFLAGS = $(CFLAGS)' - @echo ' PICFLAG = $(PICFLAG)' - @echo ' BNLD = $(BNLD)' - @echo ' BNLD_FLAGS = $(BNLD_FLAGS)' - @echo ' STLD = $(STLD)' - @echo ' STLD_FLAGS = $(STLD_FLAGS)' - @echo ' SHLD = $(SHLD)' - @echo ' SHLD_FLAGS = $(SHLD_FLAGS)' - @echo ' MDLD = $(MDLD)' - @echo ' MDLD_FLAGS = $(MDLD_FLAGS)' - @echo ' SHLIBEXT = $(SHLIBEXT)' @echo ' srcdir = $(srcdir)' @echo ' builddir = $(builddir)' - @echo ' pwd = '`/bin/pwd` # The permissions to give the executables INSTALLPERMS = 0755 @@ -192,12 +176,6 @@ uninstallman:: Makefile: config.status $(MK_FILES) ./config.status -etags: - etags `find $(srcdir) -name "*.[ch]"` - -ctags: - ctags `find $(srcdir) -name "*.[ch]"` - pidl/Makefile: pidl/Makefile.PL cd pidl && $(PERL) Makefile.PL @@ -235,3 +213,6 @@ pidl/lib/Parse/Pidl/Expr.pm: pidl/idl.yp mkinclude selftest/config.mk mkinclude rules.mk + +showflags:: + @echo ' pwd = '`/bin/pwd` diff --git a/source4/rules.mk b/source4/rules.mk index 0e2e2a7c75..0c4114a08e 100644 --- a/source4/rules.mk +++ b/source4/rules.mk @@ -132,3 +132,26 @@ dist:: idl_full manpages configure distclean configure: ./autogen.sh + +showflags:: + @echo 'Samba will be compiled with flags:' + @echo ' CPP = $(CPP)' + @echo ' CPPFLAGS = $(CPPFLAGS)' + @echo ' CC = $(CC)' + @echo ' CFLAGS = $(CFLAGS)' + @echo ' PICFLAG = $(PICFLAG)' + @echo ' BNLD = $(BNLD)' + @echo ' BNLD_FLAGS = $(BNLD_FLAGS)' + @echo ' STLD = $(STLD)' + @echo ' STLD_FLAGS = $(STLD_FLAGS)' + @echo ' SHLD = $(SHLD)' + @echo ' SHLD_FLAGS = $(SHLD_FLAGS)' + @echo ' MDLD = $(MDLD)' + @echo ' MDLD_FLAGS = $(MDLD_FLAGS)' + @echo ' SHLIBEXT = $(SHLIBEXT)' + +etags: + etags `find $(srcdir) -name "*.[ch]"` + +ctags: + ctags `find $(srcdir) -name "*.[ch]"` -- cgit