d6aa3cd03d
- update to 1.6.0: * https://github.com/nayuki/QR-Code-generator/compare/v1.5.0...v1.6.0 - drop cflags.patch (upstream) OBS-URL: https://build.opensuse.org/request/show/877846 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/QR-Code-generator?expand=0&rev=6
119 lines
3.5 KiB
Diff
119 lines
3.5 KiB
Diff
From 498d2a0cf6d6f01a3ffb87e358f63c3a64afeb9f Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
|
|
Date: Tue, 3 Dec 2019 12:45:34 +0100
|
|
Subject: [PATCH 4/5] Create install targets for C and CPP
|
|
|
|
---
|
|
c/Makefile | 26 ++++++++++++++++++++++++++
|
|
cpp/Makefile | 27 +++++++++++++++++++++++++++
|
|
2 files changed, 53 insertions(+)
|
|
|
|
Index: QR-Code-generator-1.6.0/c/Makefile
|
|
===================================================================
|
|
--- QR-Code-generator-1.6.0.orig/c/Makefile
|
|
+++ QR-Code-generator-1.6.0/c/Makefile
|
|
@@ -34,6 +34,8 @@ CFLAGS += -std=c99 -O
|
|
# Extra flags for diagnostics:
|
|
# CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
|
|
|
|
+# Version information
|
|
+VERSION = 1.5.0
|
|
|
|
# ---- Controlling make ----
|
|
|
|
@@ -55,9 +57,15 @@ ARFILE = lib$(LIB).a
|
|
LIBFILE = lib$(LIB).so
|
|
# Bump the soname number when the ABI changes and gets incompatible
|
|
SO_NAME = $(LIBFILE).1
|
|
+REAL_NAME = $(LIBFILE).$(VERSION)
|
|
+HEADERS = qrcodegen.h
|
|
LIBOBJ = qrcodegen.o
|
|
MAINS = qrcodegen-demo qrcodegen-test qrcodegen-worker
|
|
|
|
+# define paths to install
|
|
+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen
|
|
+LIBDIR ?= $(DESTDIR)/usr/lib
|
|
+
|
|
# Build all binaries
|
|
all: $(LIBFILE) $(ARFILE) $(MAINS)
|
|
|
|
@@ -66,6 +74,24 @@ clean:
|
|
rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS)
|
|
rm -rf .deps
|
|
|
|
+install-shared: $(LIBFILE)
|
|
+ install -d $(LIBDIR) || true
|
|
+ install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME)
|
|
+ rm -f $(LIBDIR)/$(SO_NAME)
|
|
+ ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME)
|
|
+ rm -f $(LIBDIR)/$(LIBFILE)
|
|
+ ln -s $(SO_NAME) $(LIBDIR)/$(LIBFILE)
|
|
+
|
|
+install-static: $(ARFILE)
|
|
+ install -d $(LIBDIR) || true
|
|
+ install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE)
|
|
+
|
|
+install-header: $(HEADERS)
|
|
+ install -d $(INCLUDEDIR) || true
|
|
+ install -m 0644 $(HEADERS) $(INCLUDEDIR)/
|
|
+
|
|
+install: install-shared install-static install-header
|
|
+
|
|
# Executable files
|
|
%: %.o $(LIBFILE)
|
|
$(CC) $(CFLAGS) -o $@ $< -L . -l $(LIB)
|
|
Index: QR-Code-generator-1.6.0/cpp/Makefile
|
|
===================================================================
|
|
--- QR-Code-generator-1.6.0.orig/cpp/Makefile
|
|
+++ QR-Code-generator-1.6.0/cpp/Makefile
|
|
@@ -34,6 +34,8 @@ CXXFLAGS += -std=c++11 -O
|
|
# Extra flags for diagnostics:
|
|
# CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
|
|
|
|
+# Version information
|
|
+VERSION = 1.5.0
|
|
|
|
# ---- Controlling make ----
|
|
|
|
@@ -55,9 +57,15 @@ ARFILE = lib$(LIB).a
|
|
LIBFILE = lib$(LIB).so
|
|
# Bump the soname number when the ABI changes and gets incompatible
|
|
SO_NAME = $(LIBFILE).1
|
|
+REAL_NAME = $(LIBFILE).$(VERSION)
|
|
+HEADERS = QrCode.hpp
|
|
LIBOBJ = QrCode.o
|
|
MAINS = QrCodeGeneratorDemo QrCodeGeneratorWorker
|
|
|
|
+# define paths to install
|
|
+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen
|
|
+LIBDIR ?= $(DESTDIR)/usr/lib
|
|
+
|
|
# Build all binaries
|
|
all: $(ARFILE) $(LIBFILE) $(MAINS)
|
|
|
|
@@ -66,6 +74,24 @@ clean:
|
|
rm -f -- $(LIBOBJ) $(ARFILE) $(LIBFILE) $(MAINS:=.o) $(MAINS)
|
|
rm -rf .deps
|
|
|
|
+install-shared: $(LIBFILE)
|
|
+ install -d $(LIBDIR) || true
|
|
+ install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME)
|
|
+ rm -f $(LIBDIR)/$(SO_NAME)
|
|
+ ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME)
|
|
+ rm -f $(LIBDIR)/$(LIBFILE)
|
|
+ ln -s $(SO_NAME) $(LIBDIR)/$(LIBFILE)
|
|
+
|
|
+install-static: $(ARFILE)
|
|
+ install -d $(LIBDIR) || true
|
|
+ install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE)
|
|
+
|
|
+install-header: $(HEADERS)
|
|
+ install -d $(INCLUDEDIR) || true
|
|
+ install -m 0644 $(HEADERS) $(INCLUDEDIR)/
|
|
+
|
|
+install: install-shared install-static install-header
|
|
+
|
|
# Executable files
|
|
%: %.o $(LIBFILE)
|
|
$(CXX) $(CXXFLAGS) -o $@ $< -L . -l $(LIB)
|