diff --git a/CMakeLists.txt b/CMakeLists.txt index c87695f7..05f2d9e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set (ZINT_VERSION_MAJOR 2) set (ZINT_VERSION_MINOR 1) -set (ZINT_VERSION_RELEASE 3) +set (ZINT_VERSION_RELEASE 4) set (ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}" ) add_definitions (-DZINT_VERSION=\"${ZINT_VERSION}\" -Wall) diff --git a/backend/Makefile b/backend/Makefile index 8a566b35..03867661 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -7,7 +7,7 @@ # make clean cleans up a previous compilation and any object or editor files # -ZINT_VERSION:=-DZINT_VERSION=\"2.1.3\" +ZINT_VERSION:=-DZINT_VERSION=\"2.1.4\" CC := gcc @@ -41,7 +41,7 @@ libzint: code.c code128.c 2of5.c upcean.c medical.c telepen.c plessey.c postal.c $(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(POSTAL) $(CC) -Wall -fPIC $(DEFINES) $(CFLAGS) $(ZINT_VERSION) -c $(TWODIM) $(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(COMMON) - $(CC) $(CFLAGS) $(ZINT_VERSION) -shared -Wl,-soname,libzint.so -o libzint.so.2.1.3 $(INCLUDE) $(COMMON_OBJ) $(ONEDIM_OBJ) $(TWODIM_OBJ) $(POSTAL_OBJ) $(LIBS) + $(CC) $(CFLAGS) $(ZINT_VERSION) -shared -Wl,-soname,libzint.so -o libzint.so.2.1.4 $(INCLUDE) $(COMMON_OBJ) $(ONEDIM_OBJ) $(TWODIM_OBJ) $(POSTAL_OBJ) $(LIBS) ln -s libzint.so.* libzint.so .PHONY: install uninstall clean dist @@ -51,8 +51,6 @@ install: install -d $(DESTDIR)$(libdir) mv libzint.* $(DESTDIR)$(libdir) install -D -p --mode=0644 zint.h $(DESTDIR)$(includedir)/zint.h - ln -s /usr/local/lib/libqrencode.so /usr/lib/libqrencode.so - ln -s /usr/local/lib/libqrencode.so.3 /usr/lib/libqrencode.so.3 uninstall: rm $(DESTDIR)$(libdir)/libzint.* diff --git a/frontend/Makefile b/frontend/Makefile index bea7c44c..03e8ba1f 100644 --- a/frontend/Makefile +++ b/frontend/Makefile @@ -6,7 +6,7 @@ # make clean cleans up a previous compilation and any object or editor files # -ZINT_VERSION:=-DZINT_VERSION=\"2.1.3\" +ZINT_VERSION:=-DZINT_VERSION=\"2.1.4\" CC := gcc INCLUDE := -I/usr/local/include diff --git a/readme b/readme index 44f05c20..4648d8bf 100644 --- a/readme +++ b/readme @@ -1,4 +1,4 @@ -Zint and libzint 2.1.3 +Zint and libzint 2.1.4 ---------------------- Zint is a front end program and library which provides support for over 40 barcode symbologies