Skip to content

Commit

Permalink
Simplify versioning to drop patch level
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom St Denis committed Feb 2, 2016
1 parent afb4224 commit 37a92dd
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
14 changes: 7 additions & 7 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion makefile.shared
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 37a92dd

Please sign in to comment.