mirror of
https://github.com/samba-team/samba.git
synced 2025-02-02 09:47:23 +03:00
automated generation of .dummy files for each subdirectory;
dummy.in files are no longer needed, and new directories will be taken care of automatically, at configure (or config.status --recheck) time
This commit is contained in:
Alexandre Oliva
-
parent
dc21f6c982
commit
237a8e5fe6
@ -320,7 +320,7 @@ uninstallcp:
|
||||
@$(SHELL) $(srcdir)/script/uninstallcp.sh $(CODEPAGEDIR) $(CODEPAGELIST)
|
||||
|
||||
clean:
|
||||
-rm -f core */*~ *~ */*.o $(PROGS) $(SPROGS)
|
||||
-rm -f core */*~ *~ */*.o
|
||||
|
||||
proto:
|
||||
@echo rebuilding include/proto.h
|
||||
@ -336,7 +336,7 @@ realclean: clean
|
||||
-rm -f config.log $(PROGS) $(SPROGS)
|
||||
|
||||
distclean: realclean
|
||||
-rm -f include/config.h include/stamp-h */dummy Makefile
|
||||
-rm -f include/config.h include/stamp-h Makefile */.dummy
|
||||
-rm -f config.status config.cache
|
||||
-rm -rf .deps
|
||||
|
||||
@ -378,6 +378,13 @@ $(srcdir)/include/stamp-h.in: @MAINT@ $(srcdir)/acconfig.h $(srcdir)/configure.i
|
||||
cd $(srcdir) && $(AUTOHEADER)
|
||||
@cd $(srcdir) && echo > include/stamp-h.in
|
||||
|
||||
DUMMY_FILES = @DUMMY_FILES@
|
||||
DUMMY_BASE = @DUMMY_BASE@
|
||||
|
||||
Makefile: $(DUMMY_FILES)
|
||||
$(DUMMY_FILES):
|
||||
CONFIG_FILES=$@$(DUMMY_BASE) CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
# automatic dependency tracking rules
|
||||
.deps/.dummy:
|
||||
@-if test ! -d .deps; then rm -rf .deps; mkdir .deps; fi
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
21
source/configure
vendored
21
source/configure
vendored
@ -5632,6 +5632,13 @@ rm -fr conftest*
|
||||
fi
|
||||
|
||||
|
||||
DUMMY_FILES=`cd ${srcdir-.} >/dev/null &&
|
||||
echo */. | sed 's, ,dummy ,g;s,$,dummy,'`
|
||||
|
||||
DUMMY_BASE=:include/stamp-h.in
|
||||
|
||||
|
||||
DUMMY_GEN=`echo "$DUMMY_FILES" | sed "s, ,$DUMMY_BASE ,g;s,\$,$DUMMY_BASE,"`
|
||||
trap '' 1 2 15
|
||||
cat > confcache <<\EOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
@ -5733,11 +5740,7 @@ done
|
||||
ac_given_srcdir=$srcdir
|
||||
ac_given_INSTALL="$INSTALL"
|
||||
|
||||
trap 'rm -fr `echo "Makefile tests/dummy client/dummy lib/dummy ubiqx/dummy
|
||||
web/dummy param/dummy nmbd/dummy smbd/dummy rpc_server/dummy
|
||||
rpc_client/dummy rpc_parse/dummy locking/dummy passdb/dummy
|
||||
script/dummy include/dummy codepages/dummy libsmb/dummy bin/dummy
|
||||
utils/dummy printing/dummy include/stamp-h include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
|
||||
trap 'rm -fr `echo "$DUMMY_GEN Makefile include/stamp-h include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
|
||||
EOF
|
||||
cat >> $CONFIG_STATUS <<EOF
|
||||
|
||||
@ -5792,6 +5795,8 @@ s%@AUTOCONF@%$AUTOCONF%g
|
||||
s%@AUTOHEADER@%$AUTOHEADER%g
|
||||
s%@CPP@%$CPP%g
|
||||
s%@LIBOBJS@%$LIBOBJS%g
|
||||
s%@DUMMY_FILES@%$DUMMY_FILES%g
|
||||
s%@DUMMY_BASE@%$DUMMY_BASE%g
|
||||
|
||||
CEOF
|
||||
EOF
|
||||
@ -5833,11 +5838,7 @@ EOF
|
||||
|
||||
cat >> $CONFIG_STATUS <<EOF
|
||||
|
||||
CONFIG_FILES=\${CONFIG_FILES-"Makefile tests/dummy client/dummy lib/dummy ubiqx/dummy
|
||||
web/dummy param/dummy nmbd/dummy smbd/dummy rpc_server/dummy
|
||||
rpc_client/dummy rpc_parse/dummy locking/dummy passdb/dummy
|
||||
script/dummy include/dummy codepages/dummy libsmb/dummy bin/dummy
|
||||
utils/dummy printing/dummy include/stamp-h"}
|
||||
CONFIG_FILES=\${CONFIG_FILES-"$DUMMY_GEN Makefile include/stamp-h"}
|
||||
EOF
|
||||
cat >> $CONFIG_STATUS <<\EOF
|
||||
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
|
||||
|
||||
@ -837,8 +837,11 @@ AC_TRY_RUN([#include "${srcdir-.}/tests/summary.c"],
|
||||
echo "configure OK";,
|
||||
AC_MSG_ERROR([summary failure. Aborting config]),:)
|
||||
|
||||
AC_OUTPUT(Makefile tests/dummy client/dummy lib/dummy ubiqx/dummy
|
||||
web/dummy param/dummy nmbd/dummy smbd/dummy rpc_server/dummy
|
||||
rpc_client/dummy rpc_parse/dummy locking/dummy passdb/dummy
|
||||
script/dummy include/dummy codepages/dummy libsmb/dummy bin/dummy
|
||||
utils/dummy printing/dummy include/stamp-h)
|
||||
DUMMY_FILES=`cd ${srcdir-.} >/dev/null &&
|
||||
echo */. | sed 's, ,dummy ,g;s,$,dummy,'`
|
||||
AC_SUBST(DUMMY_FILES)
|
||||
DUMMY_BASE=:include/stamp-h.in
|
||||
AC_SUBST(DUMMY_BASE)
|
||||
|
||||
DUMMY_GEN=`echo "$DUMMY_FILES" | sed "s, ,$DUMMY_BASE ,g;s,\$,$DUMMY_BASE,"`
|
||||
AC_OUTPUT($DUMMY_GEN Makefile include/stamp-h)
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1,2 +1 @@
|
||||
-rw-r--r-- 1 oliva pos 1394 Sep 21 08:00 acconfig.h
|
||||
-rw-r--r-- 1 oliva pos 24688 Sep 21 08:11 configure.in
|
||||
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
@ -1 +0,0 @@
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user