[Emacs-diffs] /srv/bzr/emacs/trunk r99705: Cosmetic changes to lib-src/Makefile.in.

[Glenn Morris]

------------------------------------------------------------
revno: 99705
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-03-20 11:13:46 -0700
message:
  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.
modified:
  lib-src/ChangeLog
  lib-src/Makefile.in

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2010-03-18 05:49:31 +0000
+++ b/lib-src/ChangeLog 2010-03-20 18:13:46 +0000
@@ -1,3 +1,11 @@
+2010-03-20  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)

=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in       2010-03-18 05:49:31 +0000
+++ b/lib-src/Makefile.in       2010-03-20 18:13:46 +0000
@@ -130,6 +130,27 @@
 # If neither flag is set, blessmail is used.
 MOVE_FLAGS=
 
+## -lkrb if HAVE_LIBKRB or -lkrb4 if HAVE_LIBKRB4
address@hidden@
+## -ldes if HAVE_LIBDES or -ldes425 if HAVE_LIBDES425
address@hidden@
+## -lkrb5 if HAVE_LIBKRB5
address@hidden@
+## -lk5crypto if HAVE_LIBK5CRYPTO or -lcrypto if HAVE_LIBCRYPTO
address@hidden@
+## -lcom_err if HAVE_LIBCOM_ERR
address@hidden@
+## -lhesiod if HAVE_LIBHESIOD
address@hidden@
+## -lresolv if HAVE_LIBRESOLV
address@hidden@
+## -llockfile if HAVE_LIBLOCKFILE or -lmail if HAVE_LIBMAIL
address@hidden@
+
+## 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
 
address@hidden@ @DESLIB@ @KRB5LIB@ @CRYPTOLIB@ @COM_ERRLIB@ @LIBHESIOD@ 
@LIBRESOLV@
-
address@hidden@
-
 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)