TeaSpeak/tommath
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify versioning to drop patch level

Browse Source
This commit is contained in:
Tom St Denis 2016-02-02 11:54:57 -05:00
parent afb4224186
commit 37a92dd079
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
makefile
View File

@ -174,13 +174,13 @@ pre_gen:
rm mpi.c rm mpi.c
zipup: zipup:
rm -rf ../libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH) \ rm -rf ../libtommath-$(VERSION) \
&& rm -f ../ltm-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).zip ../ltm-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).tar.bz2 && rm -f ../ltm-$(VERSION).zip ../ltm-$(VERSION).tar.bz2
git archive HEAD --prefix=libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)/ > ../libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).tar git archive HEAD --prefix=libtommath-$(VERSION)/ > ../libtommath-$(VERSION).tar
cd .. ; tar xf libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).tar cd .. ; tar xf libtommath-$(VERSION).tar
MAKE=${MAKE} ${MAKE} -C ../libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH) clean manual poster docs MAKE=${MAKE} ${MAKE} -C ../libtommath-$(VERSION) clean manual poster docs
tar -c ../libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)/* | xz -9 > ../ltm-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).tar.xz tar -c ../libtommath-$(VERSION)/* | xz -9 > ../ltm-$(VERSION).tar.xz
cd .. ; zip -9r ltm-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).zip libtommath-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH) cd .. ; zip -9r ltm-$(VERSION).zip libtommath-$(VERSION)
new_file: new_file:
bash updatemakes.sh bash updatemakes.sh

5
makefile.include
View File

@ -3,9 +3,8 @@
# #
#version of library #version of library
VER_MAJOR=1 VERSION=1.0
VER_MINOR=0 VERSION_SO=1:0
VER_PATCH=0
# default make target # default make target
default: ${LIBNAME} default: ${LIBNAME}

2
makefile.shared
View File

@ -48,7 +48,7 @@ objs: $(OBJECTS)
$(LTCOMPILE) $(CFLAGS) $(LDFLAGS) -o $@ -c $< $(LTCOMPILE) $(CFLAGS) $(LDFLAGS) -o $@ -c $<
$(LIBNAME): $(OBJECTS) $(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: $(LIBNAME)
install -d $(DESTDIR)$(LIBPATH) install -d $(DESTDIR)$(LIBPATH)