14077: revert clint's build patches on 19.04.2001

7 files changed, 4 insertions, 35 deletions

diff --git a/Src/Makefile.in b/Src/Makefile.in
index 2fd48a151..faa10cbfe 100644
--- a/Src/Makefile.in
+++ b/Src/Makefile.in
@@ -82,11 +82,11 @@ EXTRAZSHOBJS = @EXTRAZSHOBJS@
 
 zsh$(EXEEXT): $(@L@IBZSH) $(@L@STMP) $(MAIN_OBJS) zsh.export $(EXTRAZSHOBJS)
 	rm -f $@
-	$(@L@DRUNPATH) $(LINK) $(MAIN_OBJS) $(EXTRAZSHOBJS) $(@L@LIST) $(ZSH_@E@XPORT) $(@L@IBZSH) $(MAINLIBS)
+	$(@L@DRUNPATH) $(LINK) $(MAIN_OBJS) $(EXTRAZSHOBJS) $(@L@LIST) $(ZSH_@E@XPORT) $(@L@IBZSH) $(LIBS)
 
 $(LIBZSH): $(LIBOBJS) $(NSTMP)
 	rm -f $@
-	$(DLLINK) $(LIBOBJS) $(NLIST) $(MAINLIBS)
+	$(DLLINK) $(LIBOBJS) $(NLIST) $(LIBS)
 
 zsh.res.o: $(sdir)/zsh.rc $(sdir)/zsh.ico
 	windres -O coff --include-dir $(sdir) -i $(sdir)/zsh.rc -o zsh.res.o
diff --git a/Src/Modules/cap.mdd b/Src/Modules/cap.mdd
index 0393f7f38..4e7ee7216 100644
--- a/Src/Modules/cap.mdd
+++ b/Src/Modules/cap.mdd
@@ -5,5 +5,3 @@ load=no
 autobins="cap getcap setcap"
 
 objects="cap.o"
-
-extralibs="cap"
diff --git a/Src/Modules/termcap.mdd b/Src/Modules/termcap.mdd
index 9c1f92d46..a3ee39e02 100644
--- a/Src/Modules/termcap.mdd
+++ b/Src/Modules/termcap.mdd
@@ -16,5 +16,3 @@ autobins="echotc"
 autoparams="termcap"
 
 objects="termcap.o"
-
-extralibs="termcap"
diff --git a/Src/Modules/terminfo.mdd b/Src/Modules/terminfo.mdd
index 0eca9ddfb..da79e9768 100644
--- a/Src/Modules/terminfo.mdd
+++ b/Src/Modules/terminfo.mdd
@@ -16,5 +16,3 @@ autobins="echoti"
 autoparams="terminfo"
 
 objects="terminfo.o"
-
-extralibs="terminfo"
diff --git a/Src/Modules/zftp.mdd b/Src/Modules/zftp.mdd
index 0e11a72d6..d9619b549 100644
--- a/Src/Modules/zftp.mdd
+++ b/Src/Modules/zftp.mdd
@@ -6,5 +6,3 @@ functions='Functions/Zftp/*'
 autobins="zftp"
 
 objects="zftp.o"
-
-extralibs="socket"
diff --git a/Src/mkmakemod.sh b/Src/mkmakemod.sh
index bb1891e2f..e80e65819 100644
--- a/Src/mkmakemod.sh
+++ b/Src/mkmakemod.sh
@@ -27,7 +27,6 @@
 #   autoprefixconds like autoinfixconds, but for prefix condition codes
 #   autoparams      parameters defined by the module, for autoloading
 #   automathfuncs   math functions defined by the module, for autoloading
-#   extralibs       libraries specific to this module (default none)
 #   objects         .o files making up this module (*must* be defined)
 #   proto           .syms files for this module (default generated from $objects)
 #   headers         extra headers for this module (default none)
@@ -191,8 +190,7 @@ if $first_stage; then
 
 	unset name moddeps nozshdep alwayslink hasexport
 	unset autobins autoinfixconds autoprefixconds autoparams automathfuncs
-	unset extralibs objects proto headers hdrdeps otherincs
-	unset EXTRALIBS
+	unset objects proto headers hdrdeps otherincs
 	. $top_srcdir/$the_subdir/${mddname}.mdd
 	q_name=`echo $name | sed 's,Q,Qq,g;s,_,Qu,g;s,/,Qs,g'`
 	test -n "${moddeps+set}" || moddeps=
@@ -201,24 +199,6 @@ if $first_stage; then
 	    proto=`echo $objects '' | sed 's,\.o ,.syms ,g'`
 
 	dobjects=`echo $objects '' | sed 's,\.o ,..o ,g'`
-
-	for lib in $extralibs; do
-	case $lib in
-	m) EXTRALIBS="$EXTRALIBS \$(LIBS_M)"
-	;;
-	cap) EXTRALIBS="$EXTRALIBS \$(LIBS_CAP)"
-	;;
-	socket) EXTRALIBS="$EXTRALIBS \$(LIBS_SOCKET)"
-	;;
-	termcap) EXTRALIBS="$EXTRALIBS \$(LIBS_TERMCAP)"
-	;;
-	terminfo) EXTRALIBS="$EXTRALIBS \$(LIBS_TERMINFO)"
-	;;
-	yp) EXTRALIBS="$EXTRALIBS \$(LIBS_YP)"
-	;;
-	esac
-	done
-
 	modhdeps=
 	mododeps=
 	exportdeps=
@@ -322,7 +302,6 @@ if $first_stage; then
 	echo "NXPIMP_${mddname} ="
 	echo "LINKMODS_${mddname} = $mododeps"
 	echo "NOLINKMODS_${mddname} = "
-	echo "EXTRALIBS_${mddname} = $EXTRALIBS"
 	echo
 	echo "proto.${mddname}: \$(EPRO_${mddname})"
 	echo "\$(SYMS_${mddname}): \$(PROTODEPS)"
@@ -349,7 +328,7 @@ if $first_stage; then
 	    echo
 	    echo "${mddname}.\$(DL_EXT): \$(MODDOBJS_${mddname}) ${mddname}.export $exportdeps \$(@LINKMODS@_${mddname})"
 	    echo '	rm -f $@'
-	    echo "	\$(DLLINK) \$(@E@XPIMP_$mddname) \$(@E@NTRYOPT) \$(MODDOBJS_${mddname}) \$(@LINKMODS@_${mddname}) $EXTRALIBS \$(LIBS)"
+	    echo "	\$(DLLINK) \$(@E@XPIMP_$mddname) \$(@E@NTRYOPT) \$(MODDOBJS_${mddname}) \$(@LINKMODS@_${mddname}) \$(LIBS) "
 	    echo
 	fi
 	echo "${mddname}.mdhi: ${mddname}.mdhs \$(INCS_${mddname})"
diff --git a/Src/zsh.mdd b/Src/zsh.mdd
index 7ec492330..e2b7b91b5 100644
--- a/Src/zsh.mdd
+++ b/Src/zsh.mdd
@@ -17,8 +17,6 @@ signames.o string.o subst.o text.o utils.o watch.o"
 headers="../config.h system.h zsh.h sigcount.h signals.h \
 prototypes.h hashtable.h ztype.h"
 
-#extralibs="m termcap yp"
-
 :<<\Make
 @CONFIG_MK@