From 3ff259c0ecf1db3602351ab7289674eff42d8ae0 Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Fri, 7 Mar 2014 17:11:18 +0800 Subject: [PATCH] support -extra level version for pkgconfig. this is useful when we release bugfix version --- CONFIG | 6 ------ Makefile | 9 ++++++--- pkgconfig.mk | 11 +++++++++++ 3 files changed, 17 insertions(+), 9 deletions(-) delete mode 100644 CONFIG create mode 100644 pkgconfig.mk diff --git a/CONFIG b/CONFIG deleted file mode 100644 index e86e47f8..00000000 --- a/CONFIG +++ /dev/null @@ -1,6 +0,0 @@ -// Package version - -#define PKG_MAJOR 2 -#define PKG_MINOR 1 - - diff --git a/Makefile b/Makefile index cbf89d3f..9b6650a1 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ # By Nguyen Anh Quynh , 2013> include config.mk +include pkgconfig.mk # package version ifeq ($(CROSS),) CC ?= cc @@ -188,8 +189,6 @@ LIBRARY = lib$(LIBNAME).$(EXT) ARCHIVE = lib$(LIBNAME).$(AR_EXT) PKGCFGF = $(LIBNAME).pc -VERSION=$(shell echo `grep -e PKG_MAJOR -e PKG_MINOR CONFIG | grep -v = | awk '{print $$3}'` | awk '{print $$1"."$$2}') - .PHONY: all clean install uninstall dist all: $(LIBRARY) $(ARCHIVE) $(PKGCFGF) @@ -232,7 +231,11 @@ $(ARCHIVE): $(LIBOBJ) $(PKGCFGF): echo 'Name: capstone' > $(PKGCFGF) echo 'Description: Capstone disassembly engine' >> $(PKGCFGF) - echo 'Version: $(VERSION)' >> $(PKGCFGF) +ifeq ($(PKG_EXTRA),) + echo 'Version: $(PKG_MAJOR).$(PKG_MINOR)' >> $(PKGCFGF) +else + echo 'Version: $(PKG_MAJOR).$(PKG_MINOR).$(PKG_EXTRA)' >> $(PKGCFGF) +endif echo 'libdir=$(LIBDIR)' >> $(PKGCFGF) echo 'includedir=$(PREFIX)/include/capstone' >> $(PKGCFGF) echo 'archive=$${libdir}/libcapstone.a' >> $(PKGCFGF) diff --git a/pkgconfig.mk b/pkgconfig.mk new file mode 100644 index 00000000..e265e8c0 --- /dev/null +++ b/pkgconfig.mk @@ -0,0 +1,11 @@ +# Package version of Capstone for Makefile. +# To be used to generate capstone.pc for pkg-config + +# version major & minor +PKG_MAJOR = 2 +PKG_MINOR = 1 + +# version bugfix level. Example: PKG_EXTRA = 1 +PKG_EXTRA = + +