From 0937edd7862ed1991881e2a7f640cd118b64855c Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Fri, 20 Sep 2019 03:56:57 +0200 Subject: [PATCH] Re-generate the Makefiles --- src/Makefile | 2 +- tests/Makefile | 2 +- tools/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index cfa3cca..c3dbfe2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -25,7 +25,7 @@ all: $(TARGETS) libSystem_OBJS = $(OBJDIR)array.o $(OBJDIR)buffer.o $(OBJDIR)config.o $(OBJDIR)error.o $(OBJDIR)event.o $(OBJDIR)hash.o $(OBJDIR)mutator.o $(OBJDIR)object.o $(OBJDIR)parser.o $(OBJDIR)plugin.o $(OBJDIR)string.o $(OBJDIR)token.o $(OBJDIR)variable.o libSystem_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) -libSystem_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `../tools/platform.sh -O DESTDIR="$(DESTDIR)" -l dl` +libSystem_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `../tools/platform.sh -O DESTDIR="$(DESTDIR)" -l dl` `../tools/platform.sh -O DESTDIR="$(DESTDIR)" -l m` $(OBJDIR)libSystem.a: $(libSystem_OBJS) $(AR) $(ARFLAGS) $(OBJDIR)libSystem.a $(libSystem_OBJS) diff --git a/tests/Makefile b/tests/Makefile index 0fafc2e..db66637 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -9,7 +9,7 @@ CPPFLAGSF= -I ../include CPPFLAGS= CFLAGSF = CFLAGS = -W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector -LDFLAGSF= -L$(OBJDIR)../src -Wl,-rpath,$(OBJDIR)../src -lSystem `../tools/platform.sh -O DESTDIR="$(DESTDIR)" -l dl` +LDFLAGSF= -L$(OBJDIR)../src -Wl,-rpath,$(OBJDIR)../src -lSystem `../tools/platform.sh -O DESTDIR="$(DESTDIR)" -l dl` `../tools/platform.sh -O DESTDIR="$(DESTDIR)" -l m` LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now EXEEXT = RM = rm -f diff --git a/tools/Makefile b/tools/Makefile index b75f26e..505bace 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -9,7 +9,7 @@ CPPFLAGSF= -I ../include CPPFLAGS= CFLAGSF = CFLAGS = -W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector -LDFLAGSF= -L$(OBJDIR)../src -Wl,-rpath,$(PREFIX)/lib -lSystem +LDFLAGSF= -L$(OBJDIR)../src -Wl,-rpath,$(PREFIX)/lib -lSystem `../tools/platform.sh -O DESTDIR="$(DESTDIR)" -l dl` `../tools/platform.sh -O DESTDIR="$(DESTDIR)" -l m` LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now EXEEXT = RM = rm -f