X-Git-Url: http://gitweb/?a=blobdiff_plain;f=Makefile;h=2035ef69db730377d588bb31aaf10a03ae7d8c23;hb=632a66b648eb8a267a62d101c8e1182f1647017d;hp=7517a2cb508f03b1390b9d8cf436a39384562c5a;hpb=9ac667e68d3e36eb99272eac57219002ee2318e6;p=pkgutils-cross.git

diff --git a/Makefile b/Makefile
index 7517a2c..2035ef6 100644
--- a/Makefile
+++ b/Makefile
@@ -25,32 +25,20 @@ MANDIR = /usr/man
 ETCDIR = /etc
 
 VERSION = 5.21
-LIBTAR_VERSION = 1.2.11
 
 CXXFLAGS += -DNDEBUG
 CXXFLAGS += -O2 -Wall -pedantic -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" \
-	    -Ilibtar-$(LIBTAR_VERSION)/lib -Ilibtar-$(LIBTAR_VERSION)/listhash
+	    -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
-LDFLAGS += -static -Llibtar-$(LIBTAR_VERSION)/lib -ltar -lz
+LDFLAGS += -static -larchive -lz -lbz2
 
 OBJECTS = main.o pkgutil.o pkgadd.o pkgrm.o pkginfo.o
 
 MANPAGES = pkgadd.8 pkgrm.8 pkginfo.8 pkgmk.8 rejmerge.8
 
-LIBTAR = libtar-$(LIBTAR_VERSION)/lib/libtar.a
-
 all: pkgadd pkgmk rejmerge man
 
-$(LIBTAR):
-	(tar xzf libtar-$(LIBTAR_VERSION).tar.gz; \
-	cd libtar-$(LIBTAR_VERSION); \
-	patch -p1 < ../libtar-$(LIBTAR_VERSION)-fix_mem_leak.patch; \
-	patch -p1 < ../libtar-$(LIBTAR_VERSION)-reduce_mem_usage.patch; \
-	patch -p1 < ../libtar-$(LIBTAR_VERSION)-fix_linkname_overflow.patch; \
-	LDFLAGS="" ./configure --disable-encap --disable-encap-install; \
-	make)
-
-pkgadd: $(LIBTAR) .depend $(OBJECTS)
+pkgadd: .depend $(OBJECTS)
 	$(CXX) $(OBJECTS) -o $@ $(LDFLAGS)
 
 pkgmk: pkgmk.in
@@ -79,8 +67,9 @@ endif
 dist: distclean
 	rm -rf /tmp/pkgutils-$(VERSION)
 	mkdir -p /tmp/pkgutils-$(VERSION)
+	git-log > ChangeLog
 	cp -rf . /tmp/pkgutils-$(VERSION)
-	tar -C /tmp --exclude .svn -czvf ../pkgutils-$(VERSION).tar.gz pkgutils-$(VERSION)
+	tar -C /tmp --exclude .git -czvf ../pkgutils-$(VERSION).tar.gz pkgutils-$(VERSION)
 	rm -rf /tmp/pkgutils-$(VERSION)
 
 install: all
@@ -106,6 +95,5 @@ clean:
 
 distclean: clean
 	rm -f pkgadd pkginfo pkgrm pkgmk rejmerge
-	rm -rf libtar-$(LIBTAR_VERSION)
 
 # End of file