RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: sat-solver Date: 08-Apr-2008 16:23:22
Branch: HEAD Handle: 2008040814232101
Added files:
sat-solver/tools Makefile.am
Modified files:
sat-solver Makefile.am configure.ac
sat-solver/src Makefile Makefile.am
sat-solver/tools .cvsignore
Log:
- jbj: use autoconf for tools/ as well.
Summary:
Revision Changes Path
1.2 +2 -1 sat-solver/Makefile.am
1.2 +1 -1 sat-solver/configure.ac
1.3 +1 -1 sat-solver/src/Makefile
1.2 +1 -1 sat-solver/src/Makefile.am
1.2 +3 -0 sat-solver/tools/.cvsignore
1.1 +44 -0 sat-solver/tools/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: sat-solver/Makefile.am
============================================================================
$ cvs diff -u -r1.1 -r1.2 Makefile.am
--- sat-solver/Makefile.am 8 Apr 2008 01:23:08 -0000 1.1
+++ sat-solver/Makefile.am 8 Apr 2008 14:23:21 -0000 1.2
@@ -12,7 +12,8 @@
# po
#endif
SUBDIRS += \
- src
+ src \
+ tools
AM_CPPFLAGS = \
-I$(srcdir) \
@@ .
patch -p0 <<'@@ .'
Index: sat-solver/configure.ac
============================================================================
$ cvs diff -u -r1.1 -r1.2 configure.ac
--- sat-solver/configure.ac 8 Apr 2008 01:23:08 -0000 1.1
+++ sat-solver/configure.ac 8 Apr 2008 14:23:21 -0000 1.2
@@ -19,4 +19,4 @@
AM_GNU_GETTEXT([external])
-AC_OUTPUT([ Makefile src/Makefile ])
+AC_OUTPUT([ Makefile src/Makefile tools/Makefile ])
@@ .
patch -p0 <<'@@ .'
Index: sat-solver/src/Makefile
============================================================================
$ cvs diff -u -r1.2 -r1.3 Makefile
--- sat-solver/src/Makefile 8 Apr 2008 01:23:09 -0000 1.2
+++ sat-solver/src/Makefile 8 Apr 2008 14:23:21 -0000 1.3
@@ -238,7 +238,7 @@
#if HAVE_LD_VERSION_SCRIPT
#libsatsolver_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libsatsolver.vers
#endif
-libsatsolver_la_LIBADD =
+libsatsolver_la_LIBADD = -lexpat
all: all-am
.SUFFIXES:
@@ .
patch -p0 <<'@@ .'
Index: sat-solver/src/Makefile.am
============================================================================
$ cvs diff -u -r1.1 -r1.2 Makefile.am
--- sat-solver/src/Makefile.am 8 Apr 2008 01:23:09 -0000 1.1
+++ sat-solver/src/Makefile.am 8 Apr 2008 14:23:21 -0000 1.2
@@ -40,7 +40,7 @@
#if HAVE_LD_VERSION_SCRIPT
#libsatsolver_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libsatsolver.vers
#endif
-libsatsolver_la_LIBADD =
+libsatsolver_la_LIBADD = -lexpat
#if ENABLE_BUILD_INTLIBDEP
#libsatsolver_la_LIBADD += \
# $(top_builddir)/rpmdb/librpmdb.la \
@@ .
patch -p0 <<'@@ .'
Index: sat-solver/tools/.cvsignore
============================================================================
$ cvs diff -u -r1.1 -r1.2 .cvsignore
--- sat-solver/tools/.cvsignore 7 Apr 2008 23:54:52 -0000 1.1
+++ sat-solver/tools/.cvsignore 8 Apr 2008 14:23:22 -0000 1.2
@@ -10,3 +10,6 @@
rpms2solv
susetags2solv
updateinfoxml2solv
+.deps
+.libs
+Makefile.in
@@ .
patch -p0 <<'@@ .'
Index: sat-solver/tools/Makefile.am
============================================================================
$ cvs diff -u -r0 -r1.1 Makefile.am
--- /dev/null 2008-04-08 16:22:00 +0200
+++ Makefile.am 2008-04-08 16:23:22 +0200
@@ -0,0 +1,44 @@
+# Makefile for rpm tools.
+
+AUTOMAKE_OPTIONS = 1.4 foreign
+
+AM_CPPFLAGS = -I. \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/src
+
+EXTRA_DIST = repo2solv.sh
+
+EXTRA_PROGRAMS =
+
+myLDADD = \
+ $(top_builddir)/src/libsatsolver.la
+
+noinst_PROGRAMS = dumpsolv helix2solv mergesolv patchxml2solv \
+ rpmdb2solv rpmmd2solv rpms2solv susetags2solv updateinfoxml2solv
+
+dumpsolv_SOURCES = dumpsolv.c
+dumpsolv_LDADD = $(myLDADD)
+
+helix2solv_SOURCES = helix2solv.c repo_write.c common_write.c
+helix2solv_LDADD = $(myLDADD)
+
+mergesolv_SOURCES = mergesolv.c repo_write.c common_write.c
+mergesolv_LDADD = $(myLDADD)
+
+patchxml2solv_SOURCES = patchxml2solv.c repo_patchxml.c repo_write.c
common_write.c
+patchxml2solv_LDADD = $(myLDADD)
+
+rpmdb2solv_SOURCES = rpmdb2solv.c repo_rpmdb.c repo_write.c common_write.c
+rpmdb2solv_LDADD = $(myLDADD) -lrpmdb
+
+rpmmd2solv_SOURCES = rpmmd2solv.c repo_rpmmd.c repo_write.c common_write.c
+rpmmd2solv_LDADD = $(myLDADD) -lz
+
+rpms2solv_SOURCES = rpms2solv.c repo_rpmdb.c repo_write.c common_write.c
+rpms2solv_LDADD = $(myLDADD) -lrpmdb
+
+susetags2solv_SOURCES = susetags2solv.c repo_content.c repo_susetags.c
repo_write.c common_write.c
+susetags2solv_LDADD = $(myLDADD) -lz
+
+updateinfoxml2solv_SOURCES = updateinfoxml2solv.c repo_updateinfoxml.c
repo_write.c common_write.c
+updateinfoxml2solv_LDADD = $(myLDADD)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
