From 697ad838ee9312bb947d6d9992f84d0f3b41d607 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 25 Nov 2020 12:08:27 +0100 Subject: Makefile: change order of compiler parameters --- Makefile | 8 ++++---- lib/Makefile | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index a146ff2..1ff5d66 100644 --- a/Makefile +++ b/Makefile @@ -49,16 +49,16 @@ lib/libcqrlogo.o: lib/Makefile lib/libcqrlogo.c lib/libcqrlogo.h config.h versio $(MAKE) -C lib libcqrlogo.o cqrlogo.cgi: lib/libcqrlogo.so cqrlogo.c cqrlogo.h config.h version.h - $(CC) $(CFLAGS) -lcqrlogo -Llib/ -Ilib/ $(LDFLAGS) -DHAVE_FCGI=0 -o cqrlogo.cgi cqrlogo.c + $(CC) cqrlogo.c $(CFLAGS) -lcqrlogo -Llib/ -Ilib/ $(LDFLAGS) -DHAVE_FCGI=0 -o cqrlogo.cgi cqrlogo.cgi.static: lib/libcqrlogo.o cqrlogo.c cqrlogo.h config.h version.h - $(CC) $(CFLAGSSTATIC) -Ilib/ $(LDFLAGS) -DHAVE_FCGI=0 -o cqrlogo.cgi.static cqrlogo.c lib/libcqrlogo.o + $(CC) cqrlogo.c lib/libcqrlogo.o $(CFLAGSSTATIC) -Ilib/ $(LDFLAGS) -DHAVE_FCGI=0 -o cqrlogo.cgi.static cqrlogo.fcgi: lib/libcqrlogo.so cqrlogo.c cqrlogo.h config.h version.h - $(CC) $(CFLAGS) -lcqrlogo -Llib/ -Ilib/ -lfcgi $(LDFLAGS) -DHAVE_FCGI=1 -o cqrlogo.fcgi cqrlogo.c + $(CC) cqrlogo.c $(CFLAGS) -lcqrlogo -Llib/ -Ilib/ -lfcgi $(LDFLAGS) -DHAVE_FCGI=1 -o cqrlogo.fcgi cqrlogo.fcgi.static: lib/libcqrlogo.o cqrlogo.c cqrlogo.h config.h version.h - $(CC) $(CFLAGSSTATIC) -Ilib/ -lfcgi $(LDFLAGS) -DHAVE_FCGI=1 -o cqrlogo.fcgi.static cqrlogo.c lib/libcqrlogo.o + $(CC) cqrlogo.c lib/libcqrlogo.o $(CFLAGSSTATIC) -Ilib/ -lfcgi $(LDFLAGS) -DHAVE_FCGI=1 -o cqrlogo.fcgi.static version.h: $(wildcard .git/HEAD .git/index .git/refs/tags/*) Makefile printf "#ifndef VERSION\n#define VERSION \"%s\"\n#endif\n" $(shell git describe --long 2>/dev/null || echo ${VERSION}) > $@ diff --git a/lib/Makefile b/lib/Makefile index 9cd78c5..068a482 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -15,10 +15,10 @@ LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie all: libcqrlogo.so libcqrlogo.o: libcqrlogo.c libcqrlogo.h ../config.h ../version.h Makefile - $(CC) $(CFLAGS) -c -o libcqrlogo.o libcqrlogo.c + $(CC) libcqrlogo.c $(CFLAGS) -c -o libcqrlogo.o libcqrlogo.so: libcqrlogo.c libcqrlogo.h ../config.h ../version.h Makefile - $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,libcqrlogo.so.$(SOVERSION) -o libcqrlogo.so.$(SOVERSION) libcqrlogo.c + $(CC) libcqrlogo.c $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,libcqrlogo.so.$(SOVERSION) -o libcqrlogo.so.$(SOVERSION) $(LN) -sf libcqrlogo.so.$(SOVERSION) libcqrlogo.so clean: -- cgit v1.2.3-54-g00ecf