diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 2e0abccc4..ecdb4fd44 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,10 +33,11 @@ ETCDIR=$(ROOT)/etc SUBDIRS = popt @MISCDIR@ lib build tools @PO@ INSTSUBDIRS = lib @PO@ OTHERSUBDIRS = docs autodeps -OBJS = rpm.o query.o install.o verify.o checksig.o ftp.o url.o @GETTEXTSTUB@ +OBJS = rpm.o query.o install.o verify.o checksig.o ftp.o url.o build.o \ + @GETTEXTSTUB@ PROGS = @RPM@ rpm2cpio LIBS = @LIBS@ @LIBINTL@ @LIBDL@ -LOADLIBES = -lbuild popt/libpopt.a $(topdir)/lib/librpm.a -L$(topdir)/misc @LIBMISC@ +LOADLIBES = -lrpmbuild -lpopt -lrpm @LIBMISC@ SOURCES = $(subst .o,.c,$(OBJS)) @@ -48,11 +49,11 @@ endif all: $(TARGET) -rpm: lib/librpm.a build/libbuild.a @MISCPATH@ $(OBJS) - $(CC) -o rpm -static $(LDFLAGS) $(OBJS) $(LOADLIBES) $(LIBS) \ +rpm: lib/librpm.a build/librpmbuild.a @MISCPATH@ $(OBJS) + $(CC) -o rpm -static $(OBJS) $(LDFLAGS) $(LOADLIBES) $(LIBS) \ $(LIBEFENCE) -rpm.shared: lib/librpm.a build/libbuild.a $(OBJS) +rpm.shared: lib/librpm.a build/rpmlibbuild.a $(OBJS) $(CC) -o rpm.shared $(LDFLAGS) $(OBJS) $(LOADLIBES) $(LIBS) \ $(LIBEFENCE) @@ -68,6 +69,8 @@ rpm2cpio: lib/librpm.a rpm2cpio.o rpm.o: rpm.c query.h install.h lib/rpmlib.h Makefile $(CC) $(CFLAGS) -DRPMNLSPACKAGE=\"$(RPMNLSPACKAGE)\" \ -DRPMNLSDIR=\"$(RPMNLSDIR)\" \ + -DVERSION=\"$(VERSION)\" \ + -DLIBRPMALIAS_FILENAME="\"$(LIBRPMALIAS_FILENAME)"\" \ -c $(srcdir)/rpm.c # these rules should be in here, but they drive me batty |