made default optimizations -O2

builds shared version w/o GNU gettext (uses stubs)

CVS patchset: 493
CVS date: 1996/03/29 01:35:05

diff --git a/Makefile.in b/Makefile.in
index 3037817..821423e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,18 +1,22 @@
+# This stuff should be reasonably changeable
+
+#DEBUG = -g
+OPTS = -O2
+prefix=$(ROOT)/usr
+#LIBEFENCE = -lefence
+
+################################### Leave this stuff alone
+
 ### These are variables meant to be exported
 
 WARNINGS = -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes 
-#DEBUG = -g
-OPTS = 
 CFLAGS = $(WARNINGS) $(DEBUG) $(OPTS) -Ilib -Ibuild -I../lib -I../build
 LDFLAGS = $(DEBUG) -Llib -Lbuild -L../lib -L../build
-#LIBEFENCE = -lefence
 AR = ar r
 RANLIB = ranlib
 
 VERSION=2.0.4
 
-prefix=$(ROOT)/usr
-
 BINDIR=$(prefix)/bin
 RPMBINDIR=$(subst usr/bin,bin,$(BINDIR))
 MANDIR=$(prefix)/man/man8
@@ -29,9 +33,9 @@ NLSPACKAGE=rpm
 # -----------------------------------------------------------------------
 
 SUBDIRS = lib build tools po
-OBJS = query.o install.o verify.o checksig.o ftp.o
+OBJS = rpm.o query.o install.o verify.o checksig.o ftp.o
 PROGS = rpm rpmconvert rpm2cpio
-LOADLIBES = -lbuild -lrpm -ldb -lintl /usr/lib/libgz.a $(LIBEFENCE)
+LOADLIBES = -lbuild -lrpm -ldb /usr/lib/libgz.a 
 
 ifeq (.depend,$(wildcard .depend))
 TARGET=everything
@@ -41,9 +45,12 @@ endif
 
 all: $(TARGET)
 
-rpm: lib/librpm.a build/libbuild.a rpm.o
-       $(CC) -o rpm -static $(LDFLAGS) rpm.o $(OBJS) $(LOADLIBES)
-       $(CC) -o rpm.shared $(LDFLAGS) rpm.o $(OBJS) $(LOADLIBES)
+rpm: lib/librpm.a build/libbuild.a gettextstub.o $(OBJS)
+       $(CC) -o rpm -static $(LDFLAGS) $(OBJS) $(LOADLIBES) -lintl $(LIBEFENCE)
+       $(CC) -o rpm.shared $(LDFLAGS) $(OBJS) gettextstub.o $(LOADLIBES) $(LIBEFENCE)
+
+rpm2cpio: lib/librpm.a rpm2cpio.o
+       $(CC) -o rpm2cpio $(LDFLAGS) rpm2cpio.o $(LOADLIBES) -lintl
 
 rpm.o: rpm.c query.h install.h lib/rpmlib.h Makefile
        $(CC) $(CFLAGS) -DNLSPACKAGE=\"$(NLSPACKAGE)\" -DNLSDIR=\"$(NLSDIR)\" -DVERSION=\"$(VERSION)\" -c rpm.c