diff options
Diffstat (limited to 'ffbuild')
| -rw-r--r-- | ffbuild/library.mak | 2 | ||||
| -rwxr-xr-x | ffbuild/libversion.sh | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/ffbuild/library.mak b/ffbuild/library.mak index cfc2d36067..22f1e4c37f 100644 --- a/ffbuild/library.mak +++ b/ffbuild/library.mak @@ -34,7 +34,7 @@ $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS) $(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h | $(SUBDIR) - $$(M) $$(SRC_PATH)/ffbuild/libversion.sh $(NAME) $$< $(RAISE_MAJOR) > $$@ + $$(M) $$(SRC_PATH)/ffbuild/libversion.sh $(NAME) $$< > $$@ $(SUBDIR)lib$(FULLNAME).pc: $(SUBDIR)version.h | $(SUBDIR) $$(M) $$(SRC_PATH)/ffbuild/pkgconfig_generate.sh $(NAME) "$(DESC)" diff --git a/ffbuild/libversion.sh b/ffbuild/libversion.sh index 687adf28bc..990ce9f640 100755 --- a/ffbuild/libversion.sh +++ b/ffbuild/libversion.sh @@ -5,10 +5,8 @@ toupper(){ name=lib$1 ucname=$(toupper ${name}) file=$2 -raise_major=$3 eval $(awk "/#define ${ucname}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file") -eval ${ucname}_VERSION_MAJOR=$((${ucname}_VERSION_MAJOR+${raise_major})) eval ${ucname}_VERSION=\$${ucname}_VERSION_MAJOR.\$${ucname}_VERSION_MINOR.\$${ucname}_VERSION_MICRO eval echo "${name}_VERSION=\$${ucname}_VERSION" eval echo "${name}_VERSION_MAJOR=\$${ucname}_VERSION_MAJOR" |