Commit 37a92dd079c2135b497c9f6b509efb338e04fd18
2016-02-02T11:54:57
Simplify versioning to drop patch level
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
diff --git a/makefile b/makefile
index ede2c3a..75bc934 100644
--- a/makefile
+++ b/makefile
@@ -174,13 +174,13 @@ pre_gen:
rm mpi.c
zipup:
- rm -rf ../libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH) \
- && rm -f ../ltm-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).zip ../ltm-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).tar.bz2
- git archive HEAD --prefix=libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)/ > ../libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).tar
- cd .. ; tar xf libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).tar
- MAKE=${MAKE} ${MAKE} -C ../libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH) clean manual poster docs
- tar -c ../libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)/* | xz -9 > ../ltm-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).tar.xz
- cd .. ; zip -9r ltm-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).zip libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
+ rm -rf ../libtommath-$(VERSION) \
+ && rm -f ../ltm-$(VERSION).zip ../ltm-$(VERSION).tar.bz2
+ git archive HEAD --prefix=libtommath-$(VERSION)/ > ../libtommath-$(VERSION).tar
+ cd .. ; tar xf libtommath-$(VERSION).tar
+ MAKE=${MAKE} ${MAKE} -C ../libtommath-$(VERSION) clean manual poster docs
+ tar -c ../libtommath-$(VERSION)/* | xz -9 > ../ltm-$(VERSION).tar.xz
+ cd .. ; zip -9r ltm-$(VERSION).zip libtommath-$(VERSION)
new_file:
bash updatemakes.sh
diff --git a/makefile.include b/makefile.include
index b48fac4..c862f0f 100644
--- a/makefile.include
+++ b/makefile.include
@@ -3,9 +3,8 @@
#
#version of library
-VER_MAJOR=1
-VER_MINOR=0
-VER_PATCH=0
+VERSION=1.0
+VERSION_SO=1:0
# default make target
default: ${LIBNAME}
diff --git a/makefile.shared b/makefile.shared
index eee35c7..559720e 100644
--- a/makefile.shared
+++ b/makefile.shared
@@ -48,7 +48,7 @@ objs: $(OBJECTS)
$(LTCOMPILE) $(CFLAGS) $(LDFLAGS) -o $@ -c $<
$(LIBNAME): $(OBJECTS)
- $(LT) --mode=link --tag=CC $(CC) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VER_MAJOR):$(VER_MINOR)
+ $(LT) --mode=link --tag=CC $(CC) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION_SO)
install: $(LIBNAME)
install -d $(DESTDIR)$(LIBPATH)