From 47a7f6e9177a12ba07bed42bca2a230c48eaa6a8 Mon Sep 17 00:00:00 2001 From: jbj Date: Tue, 8 May 2001 13:59:47 +0000 Subject: [PATCH] Create db2 file manifest, as alpha is different. CVS patchset: 4755 CVS date: 2001/05/08 13:59:47 --- db3/configure | 8 ++++++-- rpmdb/Makefile.am | 38 +++++--------------------------------- 2 files changed, 11 insertions(+), 35 deletions(-) diff --git a/db3/configure b/db3/configure index 6ca89f5..16f8f8e 100755 --- a/db3/configure +++ b/db3/configure @@ -6,8 +6,12 @@ CFLAGS="$CFLAGS" $db_dist/configure \ mv Makefile Makefile.orig cat Makefile.orig | sed -e '/^install:/c\ -distdir:\ +.PHONY: listobjs\ +listobjs:\ + @echo $(OBJS)\ \ -install:\ +distdir install:\ \ db3_install: all install_setip \\' > Makefile + +make -s listobjs > db3lobjs diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am index c647acf..8de1f01 100644 --- a/rpmdb/Makefile.am +++ b/rpmdb/Makefile.am @@ -24,41 +24,13 @@ mylibpaths = \ mylibs = -lrpm -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@ LIBS = -DB3LOBJS= \ - mut_tas.lo bt_compare.lo bt_conv.lo \ - bt_curadj.lo bt_cursor.lo bt_delete.lo bt_method.lo bt_open.lo \ - bt_put.lo bt_rec.lo bt_reclaim.lo bt_recno.lo bt_rsearch.lo \ - bt_search.lo bt_split.lo bt_stat.lo bt_upgrade.lo bt_verify.lo \ - btree_auto.lo crdel_auto.lo crdel_rec.lo db.lo db_am.lo db_auto.lo \ - db_byteorder.lo db_cam.lo db_conv.lo db_dispatch.lo db_dup.lo \ - db_err.lo db_getlong.lo db_iface.lo db_join.lo db_log2.lo \ - db_meta.lo db_method.lo db_overflow.lo db_pr.lo db_rec.lo \ - db_reclaim.lo db_ret.lo db_salloc.lo db_shash.lo db_upg.lo \ - db_upg_opd.lo db_vrfy.lo db_vrfyutil.lo dbm.lo env_method.lo \ - env_open.lo env_recover.lo env_region.lo hash.lo hash_auto.lo \ - hash_conv.lo hash_dup.lo hash_func.lo hash_meta.lo hash_method.lo \ - hash_page.lo hash_rec.lo hash_reclaim.lo hash_stat.lo hash_upgrade.lo \ - hash_verify.lo hsearch.lo lock.lo lock_conflict.lo \ - lock_deadlock.lo lock_method.lo lock_region.lo lock_stat.lo \ - lock_util.lo log.lo log_archive.lo log_auto.lo log_compare.lo \ - log_findckp.lo log_get.lo log_method.lo log_put.lo log_rec.lo \ - log_register.lo mp_alloc.lo mp_bh.lo mp_fget.lo mp_fopen.lo \ - mp_fput.lo mp_fset.lo mp_method.lo mp_region.lo mp_register.lo \ - mp_stat.lo mp_sync.lo mp_trickle.lo mutex.lo os_abs.lo \ - os_alloc.lo os_dir.lo os_errno.lo os_fid.lo os_finit.lo \ - os_fsync.lo os_handle.lo os_map.lo os_method.lo os_oflags.lo \ - os_open.lo os_region.lo os_rename.lo os_root.lo os_rpath.lo \ - os_rw.lo os_seek.lo os_sleep.lo os_spin.lo os_stat.lo \ - os_tmpdir.lo os_unlink.lo qam.lo qam_auto.lo qam_conv.lo qam_files.lo \ - qam_method.lo qam_open.lo qam_rec.lo qam_stat.lo qam_upgrade.lo \ - qam_verify.lo txn.lo txn_auto.lo txn_rec.lo txn_region.lo xa.lo \ - xa_db.lo xa_map.lo +DB3LOBJS = $(shell cat $(top_builddir)/$(WITH_DB_SUBDIR)/db3lobjs) lib_LTLIBRARIES = librpmdb.la librpmdb_la_SOURCES = $(DBLIBSRCS) dbconfig.c rpmdb.c librpmdb_la_LDFLAGS = @libdb3@ @libdb2@ @libdb1@ librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS) -librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) symlinkdb3 +librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) createlinks # XXX Add internal libtool dependence install-data-local: @@ -69,13 +41,13 @@ install-data-local: falloc.lo: falloc.c $(top_srcdir)/system.h $(top_srcdir)/rpmio/rpmio.h falloc.h $(LIBTOOL) --mode=compile $(COMPILE) -c $< -.PHONY: symlinkdb3 -symlinkdb3: +.PHONY: createlinks +createlinks: for lo in $(DB3LOBJS); do \ [ -e $$lo ] || $(LN_S) $(top_builddir)/$(WITH_DB_SUBDIR)/$$lo $$lo ; \ done -distclean-local: +clean-local: rm -f $(DB3LOBJS) .PHONY: sources -- 2.7.4