Mercurial > emacs
changeset 107444:db38deea3cef
Cosmetic changes to lib-src/Makefile.in.
* Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(LIBHESIOD, LIBRESOLV): Make previous change a bit more friendly by
defining these as Makefile variables.
(LIBS_MOVE): Add LIBS_MAIL into this.
(movemail${EXEEXT}): Just use LIBS_MOVE, not LIBS_MAIL as well.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 20 Mar 2010 11:13:46 -0700 |
| parents | 6856772abdfe |
| children | 4f21cfcfbb42 |
| files | lib-src/ChangeLog lib-src/Makefile.in |
| diffstat | 2 files changed, 30 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Sat Mar 20 01:11:59 2010 -0700 +++ b/lib-src/ChangeLog Sat Mar 20 11:13:46 2010 -0700 @@ -1,3 +1,11 @@ +2010-03-20 Glenn Morris <rgm@gnu.org> + + * Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB) + (LIBHESIOD, LIBRESOLV): Make previous change a bit more friendly by + defining these as Makefile variables. + (LIBS_MOVE): Add LIBS_MAIL into this. + (movemail${EXEEXT}): Just use LIBS_MOVE, not LIBS_MAIL as well. + 2010-03-18 Glenn Morris <rgm@gnu.org> * Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
--- a/lib-src/Makefile.in Sat Mar 20 01:11:59 2010 -0700 +++ b/lib-src/Makefile.in Sat Mar 20 11:13:46 2010 -0700 @@ -130,6 +130,27 @@ # If neither flag is set, blessmail is used. MOVE_FLAGS= +## -lkrb if HAVE_LIBKRB or -lkrb4 if HAVE_LIBKRB4 +KRB4LIB=@KRB4LIB@ +## -ldes if HAVE_LIBDES or -ldes425 if HAVE_LIBDES425 +DESLIB=@DESLIB@ +## -lkrb5 if HAVE_LIBKRB5 +KRB5LIB=@KRB5LIB@ +## -lk5crypto if HAVE_LIBK5CRYPTO or -lcrypto if HAVE_LIBCRYPTO +CRYPTOLIB=@CRYPTOLIB@ +## -lcom_err if HAVE_LIBCOM_ERR +COM_ERRLIB=@COM_ERRLIB@ +## -lhesiod if HAVE_LIBHESIOD +LIBHESIOD=@LIBHESIOD@ +## -lresolv if HAVE_LIBRESOLV +LIBRESOLV=@LIBRESOLV@ +## -llockfile if HAVE_LIBLOCKFILE or -lmail if HAVE_LIBMAIL +LIBS_MAIL=@LIBS_MAIL@ + +## Extra libraries to use when linking movemail. +LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) $(COM_ERRLIB) $(LIBHESIOD) $(LIBRESOLV) + + # ========================== start of cpp stuff ======================= /* From here on, comments must be done in C syntax. */ @@ -168,10 +189,6 @@ #define BLESSMAIL #endif -LIBS_MOVE=@KRB4LIB@ @DESLIB@ @KRB5LIB@ @CRYPTOLIB@ @COM_ERRLIB@ @LIBHESIOD@ @LIBRESOLV@ - -LIBS_MAIL=@LIBS_MAIL@ - LOADLIBES=LIBS_SYSTEM LIBS_MACHINE /* Those files shared with other GNU utilities need HAVE_CONFIG_H @@ -365,7 +382,7 @@ $(GETOPTOBJS) $(LOADLIBES) -o b2m movemail${EXEEXT}: movemail.o pop.o $(GETOPTDEPS) - $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS) $(LOADLIBES) $(LIBS_MAIL) $(LIBS_MOVE) -o movemail + $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS) $(LOADLIBES) $(LIBS_MOVE) -o movemail /* We need to define emacs to get the right version of something (what?). */ movemail.o: ${srcdir}/movemail.c ../src/config.h $(GETOPT_H)