1) don't always build static version (Solaris is broken)
2) remove old .tar.gz files for 'make archive' 3) misc should be the first subdirectory built 4) made i18n support optional CVS patchset: 1064 CVS date: 1996/09/29 02:25:18
This commit is contained in:
parent
d3a6e501e8
commit
451be6d035
25
Makefile.in
25
Makefile.in
|
@ -1,14 +1,10 @@
|
|||
include Makefile.inc
|
||||
|
||||
CPP = @CPP@
|
||||
prefix= @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
srcdir= @srcdir@
|
||||
libdir= $(prefix)/lib
|
||||
|
||||
INSTALL= @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
LIBRPMRC_FILENAME=$(libdir)/rpmrc
|
||||
#LIBEFENCE = -lefence
|
||||
|
||||
#DEBUG = -g
|
||||
|
@ -36,10 +32,10 @@ NLSPACKAGE=rpm
|
|||
|
||||
# -----------------------------------------------------------------------
|
||||
|
||||
SUBDIRS = lib build tools po misc
|
||||
OBJS = rpm.o query.o install.o verify.o checksig.o ftp.o
|
||||
PROGS = rpm rpm2cpio
|
||||
LOADLIBES = -lbuild -lrpm @LIBMISC@ @LIBS@ @ZLIB@ @LIBINTL@ @LIBSOCKET@
|
||||
SUBDIRS = misc lib build tools @PO@
|
||||
OBJS = rpm.o query.o install.o verify.o checksig.o ftp.o @GETTEXTSTUB@
|
||||
PROGS = @RPMSTATIC@ rpm.shared rpm2cpio
|
||||
LOADLIBES = -lbuild -lrpm @LIBMISC@ @LIBS@ @ZLIB@ @LIBINTL@ @LIBSOCKET@ @LIBDL@
|
||||
|
||||
ifeq (.depend,$(wildcard .depend))
|
||||
TARGET=everything
|
||||
|
@ -49,9 +45,13 @@ endif
|
|||
|
||||
all: $(TARGET)
|
||||
|
||||
rpm: lib/librpm.a build/libbuild.a gettextstub.o $(OBJS)
|
||||
$(CC) -o rpm -static $(LDFLAGS) $(OBJS) $(LOADLIBES) $(LIBEFENCE)
|
||||
$(CC) -o rpm.shared $(LDFLAGS) $(OBJS) gettextstub.o $(LOADLIBES) $(LIBEFENCE)
|
||||
rpm: lib/librpm.a build/libbuild.a @GETTEXTSTUB@ $(OBJS)
|
||||
$(CC) -o rpm -static $(LDFLAGS) @GETTEXTSTUB@ $(OBJS) $(LOADLIBES) \
|
||||
$(LIBEFENCE)
|
||||
|
||||
rpm.shared: lib/librpm.a build/libbuild.a @GETTEXTSTUB@ $(OBJS)
|
||||
$(CC) -o rpm.shared $(LDFLAGS) @GETTEXTSTUB@ $(OBJS) $(LOADLIBES) \
|
||||
$(LIBEFENCE)
|
||||
|
||||
rpm2cpio: lib/librpm.a rpm2cpio.o
|
||||
$(CC) -o rpm2cpio $(LDFLAGS) rpm2cpio.o $(LOADLIBES)
|
||||
|
@ -159,6 +159,7 @@ archive: rcstag
|
|||
@tar cSpf - * | (cd /tmp/rpm-$(VERSION); tar xSpf -)
|
||||
@cd /tmp/rpm-$(VERSION); \
|
||||
make distclean; \
|
||||
rm -f *.tar.gz; \
|
||||
find . -name "RCS" -exec rm {} \;
|
||||
@cd /tmp; tar czSpf rpm-$(VERSION).tar.gz rpm-$(VERSION)
|
||||
@rm -rf /tmp/rpm-$(VERSION)
|
||||
|
|
Loading…
Reference in New Issue