diff -urN librsync-0.9.5.1.org/Makefile.am librsync-0.9.5.1/Makefile.am --- librsync-0.9.5.1.org/Makefile.am Sat Mar 15 19:37:48 2003 +++ librsync-0.9.5.1/Makefile.am Sat Mar 15 19:38:11 2003 @@ -17,12 +17,6 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - # Thus spake the master programmer: - # - # ``When the program is being tested, it - # is too late to make design changes.'' - SUBDIRS = popt lib_LTLIBRARIES = librsync.la @@ -137,7 +131,7 @@ # This is the default for any programs that don't specify a # preference. -LDADD = librsync.la $(LIBOBJS) +LDADD = librsync.la # Eventually we might want to install some of these into system # directories, but they're pretty obscure and it's hard to imagine any @@ -154,7 +148,6 @@ isprefix_driver_SOURCES = isprefix.driver.c \ isprefix.c isprefix.h -isprefix_driver_LDADD = $(LIBOBJS) popt/libpopt.a: (cd popt && $(MAKE) $(AM_MAKEFLAGS) libpopt.a) diff -urN librsync-0.9.5.1.org/configure.in librsync-0.9.5.1/configure.in --- librsync-0.9.5.1.org/configure.in Sat Mar 15 19:37:48 2003 +++ librsync-0.9.5.1/configure.in Sat Mar 15 19:37:55 2003 @@ -157,7 +157,7 @@ AC_SUBST(CC_SHOBJ_FLAG) AC_SUBST(CCMALLOC_LIB) AC_SUBST(net_libs) -AC_SUBST(LIBOBJS) +AC_LIBOBJ AC_SUBST(LIBTOOL_DEPS) AC_SUBST(BUILD_POPT)