summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrej Shadura <andrewsh@debian.org>2021-01-04 19:21:03 +0100
committerAndrej Shadura <andrewsh@debian.org>2021-01-21 12:35:32 +0100
commit37eef85f7377bbc6b0100ae6549acfea13ce0e28 (patch)
treee9dccd17e4a452f728a4a299ddeaef46e58f0faf
parent1652f36661832f5438b7e0b1a951fcdeba0f9603 (diff)
Fix Makefiles to use system compiler settings
Gbp-Pq: Name 19-fix-makefiles-to-use-system-compiler-settings.patch
-rw-r--r--src/osdctl/Makefile7
-rw-r--r--src/osdsh/Makefile31
2 files changed, 16 insertions, 22 deletions
diff --git a/src/osdctl/Makefile b/src/osdctl/Makefile
index cf2bb66..e670a2a 100644
--- a/src/osdctl/Makefile
+++ b/src/osdctl/Makefile
@@ -1,17 +1,16 @@
-CC = gcc
+CC ?= gcc
PREFIX = /usr
BINDIR = $(PREFIX)/bin
DOCDIR = $(PREFIX)/doc/osdsh
LIBDIR = -L/usr/X11R6/lib -L/usr/lib
LIBS = $(LIBDIR)
-CFLAGS = -O3
all: osdctl
osdctl:
- gcc $(LIBDIR) $(LIBS) $(CFLAGS) -o $@ $@.c
+ $(CC) $(LIBDIR) $(LIBS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $@.c
-clean:
+clean:
rm -f osdctl
diff --git a/src/osdsh/Makefile b/src/osdsh/Makefile
index 320651b..5c161f9 100644
--- a/src/osdsh/Makefile
+++ b/src/osdsh/Makefile
@@ -1,10 +1,10 @@
-CC = gcc
+CC ?= gcc
PREFIX = /usr
BINDIR = $(PREFIX)/bin
DOCDIR = $(PREFIX)/doc/osdsh
LIBDIR = -L/usr/X11R6/lib -L/usr/lib
LIBS = $(LIBDIR) -lxosd -lpthread
-CFLAGS = -O3 -rdynamic
+CFLAGS += -rdynamic
#APMOBJS = apmwatch.o
#APMLIBS = -lapm
@@ -17,12 +17,11 @@ all: osdsh libs
libs: libosdshclock.so libosdshmixer.so libosdshnet.so
%.o: %.c
-
- gcc -fPIC -c $<
+ $(CC) -fPIC -c $(CFLAGS) $(CPPFLAGS) $<
osdsh: $(OBJS)
- gcc -c $(CFLAGS) $@.c
- gcc $(CFLAGS) -o $@ osdsh.o $(OBJS) $(LIBS) -ldl
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $@.c
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ osdsh.o $(OBJS) $(LIBS) -ldl
clean: libclean
rm -f osdsh
@@ -31,18 +30,14 @@ clean: libclean
libclean:
rm -f libosdsh*.so
-libosdshclock.so:
- gcc -fPIC -c clockdisplay.c
- gcc -shared -o $@ clockdisplay.o utils.o
+libosdshclock.so: clockdisplay.o
+ $(CC) -shared $(LDFLAGS) -o $@ clockdisplay.o utils.o
-libosdshmixer.so:
- gcc -fPIC -c mixerwatch.c
- gcc -shared -o $@ mixerwatch.o utils.o
+libosdshmixer.so: mixerwatch.o
+ $(CC) -shared $(LDFLAGS) -o $@ mixerwatch.o utils.o
-libosdshapm.so:
- gcc -fPIC -c apmwatch.c
- gcc -shared -o $@ apmwatch.o utils.o -lapm
+libosdshapm.so: apmwatch.o utils.o
+ $(CC) -shared $(LDFLAGS) -o $@ apmwatch.o utils.o -lapm
-libosdshnet.so:
- gcc -fPIC -c connectionwatch.c
- gcc -shared -o $@ connectionwatch.o utils.o
+libosdshnet.so: connectionwatch.o utils.o
+ $(CC) -shared $(LDFLAGS) -o $@ connectionwatch.o utils.o