summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2003-05-22 21:21:43 +0000
committerjbj <devnull@localhost>2003-05-22 21:21:43 +0000
commitdac695e290b95514115d68dbfe21209eeb66ee82 (patch)
tree469371d0b7bb44a943643c8b1456758707dbb2b3 /Makefile.am
parent185ee2095cc22a9ab6d3f6e918a7577c7fd6e996 (diff)
downloadrpm-dac695e290b95514115d68dbfe21209eeb66ee82.tar.gz
rpm-dac695e290b95514115d68dbfe21209eeb66ee82.tar.bz2
rpm-dac695e290b95514115d68dbfe21209eeb66ee82.zip
Prepare to build with external beecrypt-3.0.0.
CVS patchset: 6871 CVS date: 2003/05/22 21:21:43
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index bef494554..ff420f3ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,21 +14,21 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader GROUPS README.amiga INSTALL \
po/*.in po/*.po po/rpm.pot \
rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
-SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
INCLUDES = \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
- -I$(top_srcdir)/beecrypt \
+ @WITH_BEECRYPT_INCLUDE@ \
-I$(top_srcdir)/popt \
@WITH_LIBELF_INCLUDE@ \
@INCPATH@
staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
-myLDFLAGS = @WITH_LIBELF_LIB@
+myLDFLAGS = @WITH_LIBELF_LIB@ @WITH_BEECRYPT_LIB@
myLDADD = \
$(top_builddir)/lib/librpm.la \
@@ -76,7 +76,7 @@ rpmd.o: $(top_srcdir)/rpmqv.c
rpmi_SOURCES =
rpmi_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS)
-rpmi_LDADD = rpmi.o $(myLDADD) @WITH_LIBELF_LIB@
+rpmi_LDADD = rpmi.o $(myLDADD) @WITH_LIBELF_LIB@ @WITH_BEECRYPT_LIB@
rpmi.o: $(top_srcdir)/rpmqv.c
$(COMPILE) -DIAM_RPMEIU -o $@ -c rpmqv.c