folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sanity. 

CVS patchset: 7810
CVS date: 2005/03/14 10:30:44
This commit is contained in:
jbj 2005-03-14 10:30:44 +00:00
parent 9697810e39
commit c79f0d930e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/Makefile.am
View File

@ -10,10 +10,10 @@ INCLUDES = -I. \
-I$(top_srcdir)/rpmdb \ -I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \ -I$(top_srcdir)/rpmio \
@WITH_BEECRYPT_INCLUDE@ \ @WITH_BEECRYPT_INCLUDE@ \
-I$(top_srcdir)/file/src \ @WITH_MAGIC_INCLUDE@ \
-I$(top_srcdir)/popt \ @WITH_POPT_INCLUDE@ \
-I$(top_srcdir)/misc \
@WITH_LIBELF_INCLUDE@ \ @WITH_LIBELF_INCLUDE@ \
-I$(top_srcdir)/misc \
@INCPATH@ @INCPATH@
LIBS = LIBS =

6
tools/Makefile.am
View File

@ -12,7 +12,7 @@ INCLUDES = -I. \
@WITH_POPT_INCLUDE@ \ @WITH_POPT_INCLUDE@ \
@WITH_LIBELF_INCLUDE@ \ @WITH_LIBELF_INCLUDE@ \
@WITH_LIBDWARF_INCLUDE@ \ @WITH_LIBDWARF_INCLUDE@ \
-I$(top_srcdir)/file/src \ @WITH_MAGIC_INCLUDE@ \
-I$(top_srcdir)/misc \ -I$(top_srcdir)/misc \
@INCPATH@ @INCPATH@
@ -28,7 +28,7 @@ staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
noinst_PROGRAMS = dumpdb noinst_PROGRAMS = dumpdb
pkgbindir = @RPMCONFIGDIR@ pkgbindir = @RPMCONFIGDIR@
pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps @WITH_RPMFILE@ pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps rpmfile
MAGIC = $(pkgbindir)/magic MAGIC = $(pkgbindir)/magic
bin_PROGRAMS = rpmgraph bin_PROGRAMS = rpmgraph
@ -54,7 +54,7 @@ rpmfile.c: $(top_srcdir)/file/src/file.c
ln -s $< $@ ln -s $< $@
rpmfile_SOURCES = rpmfile.c rpmfile_SOURCES = rpmfile.c
rpmfile_CFLAGS = -DMAGIC='"$(MAGIC)"' rpmfile_CFLAGS = -DMAGIC='"$(MAGIC)"' $(INCLUDES)
rpmfile_LDADD = $(top_builddir)/rpmio/librpmio.la rpmfile_LDADD = $(top_builddir)/rpmio/librpmio.la
#rpmfile_LDFLAGS = $(staticLDFLAGS) #rpmfile_LDFLAGS = $(staticLDFLAGS)