From 2a9b0d19cb4c6b18150fcf29da1e0d74ee47bbf0 Mon Sep 17 00:00:00 2001 From: Loup Vaillant Date: Thu, 24 Aug 2023 18:51:04 +0200 Subject: [PATCH] Revert "Do not hardcode Makefile variables" Quick tests revealed this choice was a PITA. Maybe later. This reverts commit 8471aeef9112d9bfadd027e1681188ee310f3df8. --- makefile | 16 ++++++++-------- tests/gen/makefile | 4 ++-- tests/speed/makefile | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/makefile b/makefile index 46f568c..6460b22 100644 --- a/makefile +++ b/makefile @@ -52,14 +52,14 @@ .POSIX: .SUFFIXES: -CC?=gcc -std=c99 -CFLAGS?=-pedantic -Wall -Wextra -O3 -march=native -DESTDIR?= -PREFIX?=usr/local -LIBDIR?=$(PREFIX)/lib -INCLUDEDIR?=$(PREFIX)/include -PKGCONFIGDIR?=$(LIBDIR)/pkgconfig -MANDIR?=$(PREFIX)/share/man/man3 +CC=gcc -std=c99 +CFLAGS=-pedantic -Wall -Wextra -O3 -march=native +DESTDIR= +PREFIX=usr/local +LIBDIR=$(PREFIX)/lib +INCLUDEDIR=$(PREFIX)/include +PKGCONFIGDIR=$(LIBDIR)/pkgconfig +MANDIR=$(PREFIX)/share/man/man3 SONAME=libmonocypher.so.4 .PHONY: all library static-library dynamic-library \ diff --git a/tests/gen/makefile b/tests/gen/makefile index 0adc512..800c6c0 100644 --- a/tests/gen/makefile +++ b/tests/gen/makefile @@ -49,8 +49,8 @@ # You should have received a copy of the CC0 Public Domain Dedication along # with this software. If not, see # -CC ?= gcc -std=c99 -CFLAGS ?= -pedantic -Wall -Wextra +CC = gcc -std=c99 +CFLAGS = -pedantic -Wall -Wextra .PHONY: all clean diff --git a/tests/speed/makefile b/tests/speed/makefile index a0944c9..5eecac6 100644 --- a/tests/speed/makefile +++ b/tests/speed/makefile @@ -49,8 +49,8 @@ # with this software. If not, see # -CC?=gcc -std=gnu99 -CFLAGS?= -pedantic -Wall -Wextra -O3 -march=native +CC=gcc -std=gnu99 +CFLAGS= -pedantic -Wall -Wextra -O3 -march=native .PHONY: speed speed-sodium speed-hydrogen speed-tweetnacl speed-c25519 \ speed-donna \ -- 2.47.3