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

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   09-Feb-2008 14:47:00
  Branch: HEAD                             Handle: 2008020913470000

  Modified files:
    rpm                     CHANGES
    rpm/rpmio               Makefile.am

  Log:
    - jbj: rpmio: test programs link only -lrpmio -lrpmmisc.

  Summary:
    Revision    Changes     Path
    1.2161      +1  -0      rpm/CHANGES
    1.124       +27 -19     rpm/rpmio/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2160 -r1.2161 CHANGES
  --- rpm/CHANGES	9 Feb 2008 09:04:52 -0000	1.2160
  +++ rpm/CHANGES	9 Feb 2008 13:47:00 -0000	1.2161
  @@ -1,4 +1,5 @@
   5.0.0 -> 5.1a1:
  +    - jbj: rpmio: test programs link only -lrpmio -lrpmmisc.
       - jbj: map tdir/tglob/tfts errors into exit codes.
       - jbj: dav{Stat,LStat,Opendir) return ENOENT with malformed URI (including
   	no pesky trailing /).
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.123 -r1.124 Makefile.am
  --- rpm/rpmio/Makefile.am	9 Feb 2008 09:04:52 -0000	1.123
  +++ rpm/rpmio/Makefile.am	9 Feb 2008 13:47:00 -0000	1.124
  @@ -4,9 +4,14 @@
   
   LINT = splint
   
  -EXTRA_DIST = gengpg.sh tdir.c tfts.c tget.c thkp.c tput.c tglob.c tinv.c tkey.c trpmio.c lookup3.c tpw.c librpmio.vers
  +EXTRA_DIST = gengpg.sh thkp.c tput.c tinv.c tkey.c trpmio.c lookup3.c tpw.c librpmio.vers
   
  -EXTRA_PROGRAMS = tdir tfts tget tglob thkp tinv tkey tmacro tmagic tmire tput tpw trpmio tsw dumpasn1 lookup3
  +EXTRA_PROGRAMS = thkp tinv tkey tmacro tmagic tmire tput tpw trpmio tsw dumpasn1 lookup3
  +
  +noinst_PROGRAMS = tdir tfts tget tglob
  +noinst_SCRIPTS = testit.sh
  +
  +TESTS = testit.sh
   
   AM_CPPFLAGS = \
   	-I$(srcdir) \
  @@ -22,13 +27,16 @@
   	@WITH_FILE_CPPFLAGS@ \
   	@WITH_XAR_CPPFLAGS@
   
  +RPMIO_LDADD = \
  +	$(top_builddir)/rpmio/librpmio.la \
  +	$(top_builddir)/misc/librpmmisc.la \
  +	@LTLIBINTL@
  +
   RPM_LDADD = \
   	$(top_builddir)/build/librpmbuild.la \
   	$(top_builddir)/lib/librpm.la \
   	$(top_builddir)/rpmdb/librpmdb.la \
  -	$(top_builddir)/rpmio/librpmio.la \
  -	$(top_builddir)/misc/librpmmisc.la \
  -	@LTLIBINTL@
  +	$(RPMIO_LDADD)
   
   pkgincdir = $(pkgincludedir)$(WITH_PATH_VERSIONED_SUFFIX)
   pkginc_HEADERS = \
  @@ -96,26 +104,26 @@
   	$(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
   
   tdir_SOURCES = tdir.c
  -tdir_LDADD = $(RPM_LDADD)
  +tdir_LDADD = $(RPMIO_LDADD)
   
   tfts_SOURCES = tfts.c
  -tfts_LDADD = $(RPM_LDADD)
  +tfts_LDADD = $(RPMIO_LDADD)
   
   tget_SOURCES = tget.c
  -tget_LDADD = $(RPM_LDADD)
  +tget_LDADD = $(RPMIO_LDADD)
   
   tglob_SOURCES = tglob.c
  -tglob_LDADD = $(RPM_LDADD)
  +tglob_LDADD = $(RPMIO_LDADD)
   
   thkp_SOURCES = thkp.c
  -thkp_LDADD = $(RPM_LDADD)
  +thkp_LDADD = $(RPMIO_LDADD)
   
   tinv_SOURCES = tinv.c
  -tinv_LDADD = $(RPM_LDADD)
  +tinv_LDADD = $(RPMIO_LDADD)
   
   tkey_SOURCES = gengpg.h tkey.c rpmgc.c rpmnss.c rpmssl.c
   tkey_CFLAGS  = $(CFLAGS)
  -tkey_LDADD = $(RPM_LDADD) -lgcrypt
  +tkey_LDADD = $(RPMIO_LDADD) -lgcrypt
   gengpg.h:
   	-sh ./gengpg.sh > gengpg.h
   
  @@ -125,28 +133,28 @@
   	$(COMPILE) -DDEBUG_MACROS -o $@ -c $<
   
   tmagic_SOURCES = tmagic.c
  -tmagic_LDADD = $(RPM_LDADD)
  +tmagic_LDADD = $(RPMIO_LDADD)
   
   tmire_SOURCES =
  -tmire_LDADD = tmire.o $(RPM_LDADD)
  +tmire_LDADD = tmire.o $(RPMIO_LDADD)
   tmire.o:  mire.c
   	$(COMPILE) -DSTANDALONE -o $@ -c $<
   
   tput_SOURCES = tput.c
  -tput_LDADD = $(RPM_LDADD)
  +tput_LDADD = $(RPMIO_LDADD)
   
   tpw_SOURCES = tpw.c
  -tpw_LDFLAGS = $(RPM_LDADD)
  +tpw_LDFLAGS = $(RPMIO_LDADD)
   
   trpmio_SOURCES = trpmio.c
  -trpmio_LDADD = $(RPM_LDADD)
  +trpmio_LDADD = $(RPMIO_LDADD)
   
   tsw_SOURCES = tsw.c
  -tsw_LDFLAGS = $(RPM_LDADD)
  +tsw_LDFLAGS = $(RPMIO_LDADD)
   
   dumpasn1_SOURCES = dumpasn1.c
   
   lookup3_SOURCES = lookup3.c
   lookup3_CFLAGS	= $(CFLAGS) -D_JLU3_SELFTEST
  -lookup3_LDADD = $(RPM_LDADD)
  +lookup3_LDADD = $(RPMIO_LDADD)
   
  @@ .