summaryrefslogtreecommitdiff
path: root/source4/main.mk
diff options
context:
space:
mode:
Diffstat (limited to 'source4/main.mk')
-rw-r--r--source4/main.mk21
1 files changed, 12 insertions, 9 deletions
diff --git a/source4/main.mk b/source4/main.mk
index a0fafec3a3..1a6524cbf4 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -43,6 +43,12 @@ manpages: $(MANPAGES)
all: showflags $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries modules
everything: all libraries headers
+# 'make testsuite' creates all binaries which are
+# needed by samba3's 'make test' and the build-farm
+# scripts use that it as fallback in case
+# 'make everything' fails
+testsuite: bin/smbclient bin/cifsdd bin/smbtorture bin/nmblookup
+
showlayout:
@echo 'Samba will be installed into:'
@echo ' basedir: $(BASEDIR)'
@@ -58,8 +64,7 @@ showlayout:
@echo ' logfilebase: $(LOGFILEBASE)'
@echo ' setupdir: $(SETUPDIR)'
@echo ' jsdir: $(JSDIR)'
- @echo ' webappsdir: $(WEBAPPSDIR)'
- @echo ' servicesdir: $(SERVICESDIR)'
+ @echo ' swatdir: $(SWATDIR)'
@echo ' mandir: $(MANDIR)'
@echo ' torturedir: $(TORTUREDIR)'
@echo ' datadir: $(DATADIR)'
@@ -86,7 +91,7 @@ showflags:
# The permissions to give the executables
INSTALLPERMS = 0755
-install: showlayout everything installbin installdat installwebapps installmisc installlib \
+install: showlayout everything installbin installdat installswat installmisc installlib \
installheader installpc installplugins
# DESTDIR is used here to prevent packagers wasting their time
@@ -147,9 +152,8 @@ installheader: headers installdirs
installdat: installdirs
@$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(DATADIR) $(srcdir)
-installwebapps: installdirs
- @$(SHELL) $(srcdir)/script/installwebapps.sh $(DESTDIR)$(WEBAPPSDIR) $(srcdir)
- @$(SHELL) $(srcdir)/script/installjsonrpc.sh $(DESTDIR)$(SERVICESDIR) $(srcdir)
+installswat: installdirs
+ @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir)
installman: manpages installdirs
@$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(MANPAGES)
@@ -268,7 +272,6 @@ distclean: clean
-rm -f config.status
-rm -f config.log config.cache
-rm -f config.pm config.mk
- -rm -rf ../webapps/qooxdoo-*-sdk/frontend/framework/.cache
-rm -f $(PC_FILES)
removebackup:
@@ -315,7 +318,7 @@ quicktestone: all
testenv: everything
$(SELFTEST) --socket-wrapper --testenv
-valgrindtest: valgrindtest-quick
+valgrindtest: valgrindtest-all
valgrindtest-quick: all
SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \
@@ -332,7 +335,7 @@ valgrindtest-env: everything
VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
$(SELFTEST) --socket-wrapper --testenv
-gdbtest: gdbtest-quick
+gdbtest: gdbtest-all
gdbtest-quick: all
SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \