aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClark Williams <clark.williams@gmail.com>2020-08-31 19:09:57 -0500
committerClark Williams <clark.williams@gmail.com>2020-08-31 19:11:19 -0500
commit2fdc20c347b4473980d4f417b5ccca39251bf4c9 (patch)
treeeecd2211eaf98067d38999afdff11a5327b952ae
parent143017d80af5e6a377add30c03ae30a6f7c74d04 (diff)
downloadstalld-2fdc20c347b4473980d4f417b5ccca39251bf4c9.tar.gz
Makefile: update CFLAGS/LDFLAGS and fix tab vs space issues
Add LDFLAGS variable Use tabs instead of spaces Signed-off-by: Clark Williams <clark.williams@gmail.com>
-rw-r--r--Makefile14
-rw-r--r--redhat/Makefile4
2 files changed, 10 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 21048ca..d7abd50 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,13 @@
-NAME := stalld
-VERSION := 1.0
+NAME := stalld
+VERSION := 1.0
-INSTALL=install
-CFLAGS ?= -Wall -O2 -g
+INSTALL = install
+CFLAGS ?= -Wall -O2 -g
+
+LDFLAGS := -ggdb -lpthread
DIRS := src redhat man
-FILES := Makefile README.md gpl-2.0.txt
+FILES := Makefile README.md gpl-2.0.txt
TARBALL := $(NAME)-$(VERSION).tar.xz
UPSTREAM_TARBALLS := fedorapeople.org:~/public_html/
BINDIR := /usr/bin
@@ -15,7 +17,7 @@ MANDIR := $(DATADIR)/man
LICDIR := $(DATADIR)/licenses
all: src/stalld.o
- $(CC) -o stalld -ggdb -lpthread src/stalld.o
+ $(CC) -o stalld $(LDFLAGS) src/stalld.o
.PHONY: install
install:
diff --git a/redhat/Makefile b/redhat/Makefile
index 554f28d..8ae3870 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -4,10 +4,10 @@ HERE := $(shell pwd)
RPMDIRS := SPECS SOURCES BUILDROOT RPMS SRPMS BUILD
RPMARGS := --define "_topdir $(HERE)" \
--define "_sourcedir $(HERE)/SOURCES" \
- --define "_builddir $(HERE)/BUILD" \
+ --define "_builddir $(HERE)/BUILD" \
--define "_rpmdir $(HERE)/RPMS" \
--define "_srcrpmdir $(HERE)/SRPMS"
-INSTALL := install
+INSTALL := install
UPSTREAM_TARBALLS := fedorapeople.org:~/public_html/
UNITDIR := /usr/lib/systemd/system
DATADIR := /usr/share