RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   27-Jun-2007 21:20:45
  Branch: HEAD                             Handle: 2007062720204500

  Modified files:
    rpm                     autogen.sh
    rpm/rpmdb               Makefile.am

  Log:
    In rpmdb/ the various Berkeley-DB utilities db_xxx are rebuild for
    installation purposes, although they got already built in db3/. As the
    utility object list is already incomplete (the building just still
    worked as librpm.la is linked in which contains all(!) Berkeley-DB
    objects anyway) and we don't need a second building of the tools,
    replace the building with simple symlinking. Also sort the utilities the
    same way in the _PROGRAMS list and in the targets list.

  Summary:
    Revision    Changes     Path
    2.82        +1  -1      rpm/autogen.sh
    1.65        +62 -85     rpm/rpmdb/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/autogen.sh
  ============================================================================
  $ cvs diff -u -r2.81 -r2.82 autogen.sh
  --- rpm/autogen.sh	27 Jun 2007 10:04:33 -0000	2.81
  +++ rpm/autogen.sh	27 Jun 2007 19:20:45 -0000	2.82
  @@ -48,7 +48,7 @@
   aclocal -I m4
   autoheader
   echo "---> generate files via GNU automake (automake)"
  -automake -Wall -a -c
  +automake -Wall -Wno-override -a -c
   echo "---> generate files via GNU autoconf (autoconf)"
   autoconf
   echo "<=== rpm"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.64 -r1.65 Makefile.am
  --- rpm/rpmdb/Makefile.am	27 Jun 2007 10:52:35 -0000	1.64
  +++ rpm/rpmdb/Makefile.am	27 Jun 2007 19:20:45 -0000	1.65
  @@ -26,11 +26,20 @@
   pkglibdir =		@USRLIBRPM@
   versionlibdir = 	$(pkglibdir)/@VERSION@
   versionlib_PROGRAMS = \
  -	db_archive db_checkpoint db_deadlock db_dump \
  -	db_hotbackup db_load db_printlog db_recover \
  -	db_stat db_upgrade db_verify 
  +	db_archive \
  +	db_checkpoint \
  +	db_deadlock \
  +	db_dump \
  +	db_hotbackup \
  +	db_load \
  +	db_printlog \
  +	db_recover \
  +	db_stat \
  +	db_upgrade \
  +	db_verify 
   if WITH_DB_RPC
  -versionlib_PROGRAMS += db_svc
  +versionlib_PROGRAMS += \
  +	db_svc
   endif
   
   mylibs = librpmdb.la
  @@ -85,97 +94,65 @@
   	@ln -sf ../$(WITH_DB_SUBDIR)/db.h $@
   
   db_archive_SOURCES =
  -db_archive_LDADD = \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/db_archive.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
  -	librpmdb.la
  -
  +db_archive_LDADD =
  +db_archive_DEPENDENCIES =
  +db_archive$(EXEEXT): $(top_builddir)/$(WITH_DB_SUBDIR)/db_archive
  +	$(LN_S) $< $@
   db_checkpoint_SOURCES =
  -db_checkpoint_LDADD = \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/db_checkpoint.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_log.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
  -	librpmdb.la
  -
  +db_checkpoint_LDADD =
  +db_checkpoint_DEPENDENCIES =
  +db_checkpoint$(EXEEXT): $(top_builddir)/$(WITH_DB_SUBDIR)/db_checkpoint
  +	$(LN_S) $< $@
   db_deadlock_SOURCES =
  -db_deadlock_LDADD = \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/db_deadlock.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_log.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
  -	librpmdb.la
  -
  +db_deadlock_LDADD =
  +db_deadlock_DEPENDENCIES =
  +db_deadlock$(EXEEXT): $(top_builddir)/$(WITH_DB_SUBDIR)/db_deadlock
  +	$(LN_S) $< $@
   db_dump_SOURCES =
  -db_dump_LDADD = \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/db_dump.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
  -	librpmdb.la
  -
  +db_dump_LDADD =
  +db_dump_DEPENDENCIES =
  +db_dump$(EXEEXT): $(top_builddir)/$(WITH_DB_SUBDIR)/db_dump
  +	$(LN_S) $< $@
   db_hotbackup_SOURCES =
  -db_hotbackup_LDADD = \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/db_hotbackup.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
  -	librpmdb.la
  -
  +db_hotbackup_LDADD =
  +db_hotbackup_DEPENDENCIES =
  +db_hotbackup$(EXEEXT): $(top_builddir)/$(WITH_DB_SUBDIR)/db_hotbackup
  +	$(LN_S) $< $@
   db_load_SOURCES =
  -db_load_LDADD = \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/db_load.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
  -	librpmdb.la
  -
  +db_load_LDADD =
  +db_load_DEPENDENCIES =
  +db_load$(EXEEXT): $(top_builddir)/$(WITH_DB_SUBDIR)/db_load
  +	$(LN_S) $< $@
   db_printlog_SOURCES =
  -db_printlog_LDADD = \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/db_printlog.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/btree_autop.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/crdel_autop.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/db_autop.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/dbreg_autop.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/fileops_autop.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/hash_autop.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/qam_autop.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/rep_autop.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/txn_autop.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
  -	librpmdb.la
  -
  +db_printlog_LDADD =
  +db_printlog_DEPENDENCIES =
  +db_printlog$(EXEEXT): $(top_builddir)/$(WITH_DB_SUBDIR)/db_printlog
  +	$(LN_S) $< $@
   db_recover_SOURCES =
  -db_recover_LDADD = \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/db_recover.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
  -	librpmdb.la
  -
  +db_recover_LDADD =
  +db_recover_DEPENDENCIES =
  +db_recover$(EXEEXT): $(top_builddir)/$(WITH_DB_SUBDIR)/db_recover
  +	$(LN_S) $< $@
   db_stat_SOURCES =
  -db_stat_LDADD = \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/db_stat.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
  -	librpmdb.la
  -
  -db_svc_SOURCES =
  -db_svc_LDADD = \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/db_server_proc.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/db_server_svc.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/db_server_util.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/db_server_xdr.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/gen_db_server.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_log.o \
  -	librpmdb.la
  -
  +db_stat_LDADD =
  +db_stat_DEPENDENCIES =
  +db_stat$(EXEEXT): $(top_builddir)/$(WITH_DB_SUBDIR)/db_stat
  +	$(LN_S) $< $@
   db_upgrade_SOURCES =
  -db_upgrade_LDADD = \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/db_upgrade.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
  -	librpmdb.la
  -
  +db_upgrade_LDADD =
  +db_upgrade_DEPENDENCIES =
  +db_upgrade$(EXEEXT): $(top_builddir)/$(WITH_DB_SUBDIR)/db_upgrade
  +	$(LN_S) $< $@
   db_verify_SOURCES =
  -db_verify_LDADD = \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/db_verify.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \
  -	$(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
  -	librpmdb.la
  +db_verify_LDADD =
  +db_verify_DEPENDENCIES =
  +db_verify$(EXEEXT): $(top_builddir)/$(WITH_DB_SUBDIR)/db_verify
  +	$(LN_S) $< $@
  +db_svc_SOURCES =
  +db_svc_LDADD =
  +db_svc_DEPENDENCIES =
  +db_svc$(EXEEXT): $(top_builddir)/$(WITH_DB_SUBDIR)/db_svc
  +	$(LN_S) $< $@
   
   clean-local:
   	rm -f *.o db.h
  @@ .