Repair dist target

Mark phony targets as such.

Cease use of unobtainable version-check.pl.

Take version from configure substituted variable.

Adjust dist archive location.

Prune more backup files.
This commit is contained in:
Ulrik Haugen 2019-05-20 10:36:13 +02:00
parent d6a86f847c
commit 67307d3327

View file

@ -39,6 +39,9 @@ CC=@CC@
all: ssldump all: ssldump
PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@
OBJSUFFIX=o OBJSUFFIX=o
LIBSUFFIX=a LIBSUFFIX=a
INSTALL=@INSTALL@ INSTALL=@INSTALL@
@ -73,6 +76,8 @@ LIBS += @LDFLAGS@ @LIBS@
CFLAGS += @CFLAGS@ @DEFS@ CFLAGS += @CFLAGS@ @DEFS@
.PHONY: clean install dist
ssldump: $(OBJECTS) ssldump: $(OBJECTS)
$(CC) $(OBJECTS) -o $@ $(LIBS) $(CC) $(OBJECTS) -o $@ $(LIBS)
@ -86,28 +91,29 @@ install:
$(INSTALL) -m 444 ssldump.1 $(MANDIR)/man1/ssldump.1 $(INSTALL) -m 444 ssldump.1 $(MANDIR)/man1/ssldump.1
dist: dist:
perl "./version-check.pl" rm -rf dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
- name=ssldump-`cat VERSION`; \ mkdir -p dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
rm -rf /dist/ship/$$name; \ ls -1| grep -vx -e dist -e autom4te.cache \
mkdir /dist/ship/$$name; \ | xargs cp -pR -t dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
cp -pR * /dist/ship/$$name; \ make -C dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) clean
cd /dist/ship/$$name; \ rm dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/Makefile
make -f Makefile.in clean; \ find dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) -name '*~' -exec rm {} \; -print
rm Makefile; \ find dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) -name '*.o' -exec rm {} \; -print
find . -name '*~' -exec rm {} \; -print;\ find dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) -name '#*#' -exec rm {} \; -print
find . -name '*.o' -exec rm {} \; -print;\ find dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) -name '.#*' -exec rm {} \; -print
find . -name '#*#' -exec rm {} \; -print;\ find dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) -name 'CVS' -exec rm -rf {} \; -print
find . -name 'CVS' -exec rm -rf {} \; -print;\ find dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) -name '*bak' -exec rm -rf {} \; -print
find . -name '*bak' -exec rm -rf {} \; -print;\ find dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) -name '*.core' -exec rm -rf {} \; -print
find . -name '*.core' -exec rm -rf {} \; -print;\ find dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) -name '*.tr' -exec rm -rf {} \; -print
find . -name '*.tr' -exec rm -rf {} \; -print;\ find dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) -name '*.pl' -exec rm -rf {} \; -print
find . -name '*.pl' -exec rm -rf {} \; -print;\ find dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) -name '*.pem' -exec rm -rf {} \; -print
find . -name '*.pem' -exec rm -rf {} \; -print;\ find dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) -name '*orig' -exec rm -rf {} \; -print
find . -name '*orig' -exec rm -rf {} \; -print;\ find dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) -name '*.rej' -exec rm -rf {} \; -print
find . -name '*.rej' -exec rm -rf {} \; -print;\ rm -f dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/config.status
rm -f TODO TAGS; \ rm -f dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/config.log
rm -f config.status config.log config.cache config.h; \ rm -f dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/config.cache
rm -f ssl/a.out all; \ rm -f dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/config.h
cd /dist/ship; tar cf - $$name | gzip > $$name.tar.gz rm -f dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/ssl/a.out
rm -f dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/all
tar cf - -C dist $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) \
| gzip >dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz