projects
/
rrq
/
rrqnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update for new -tpg argument
[rrq/rrqnet.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index cee9a5b6f48163781b21141b33e162be2dcbeb0b..946dbbc943da34211151c55203a758e31d48c8f7 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,16
+1,21
@@
-SBINDIR = $(DESTDIR)/usr/
local/
sbin
+SBINDIR = $(DESTDIR)/usr/sbin
ETCDIR = $(DESTDIR)/etc/rrqnet
ETCDIR = $(DESTDIR)/etc/rrqnet
-MAN1DIR = $(DESTDIR)/usr/
local/
share/man/man1
-MAN8DIR = $(DESTDIR)/usr/
local/
share/man/man8
+MAN1DIR = $(DESTDIR)/usr/share/man/man1
+MAN8DIR = $(DESTDIR)/usr/share/man/man8
-SBINFILES = rrqnet rrqnet-cron.sh
-ETCFILES = set-source-route.sh
+SBINCFILES = rrqnet
+SBINFILES = rrqnet-cron $(SBINCFILES)
+ETCFILES = set-source-route.sh ifupdown.sh
MAN1FILES =
MAN1FILES =
-MAN8FILES = rrqnet.8 rrqnet-cron.sh.8
+MAN8FILES = rrqnet.8 rrqnet-cron.
8 rrqnet-ifupdown.
sh.8
HTMLDOC = $(MAN8FILES:%=%.html)
HTMLDOC = $(MAN8FILES:%=%.html)
+.PHONY: ifupdown.sh
+
all: $(SBINFILES) $(ETCFILES) $(MAN1FILES) $(MAN8FILES) $(HTMLDOC)
all: $(SBINFILES) $(ETCFILES) $(MAN1FILES) $(MAN8FILES) $(HTMLDOC)
+squeezetest: squeeze.c squeezetest.c
+
$(HTMLDOC): %.html: %.adoc
asciidoc -bhtml $^
$(HTMLDOC): %.html: %.adoc
asciidoc -bhtml $^
@@
-26,12
+31,13
@@
rrqnet.E: rrqnet.c htable.c
COMPILEOPTS = -g -W -Wall
#COMPILEOPTS = -pg -no-pie -g -DGPROF
COMPILEOPTS = -g -W -Wall
#COMPILEOPTS = -pg -no-pie -g -DGPROF
-$(filter-out %.sh,$(SBINFILES)): %: %.c
- $(CC) $(COMPILEOPTS) -static -o $@ $^ $(LDFLAGS)
+#STATIC = -static
+$(filter-out %.sh,$(SBINCFILES)): %: %.c
+ $(CC) $(COMPILEOPTS) $(STATIC) -o $@ $^ $(LDFLAGS)
.PHONY: clean
clean:
.PHONY: clean
clean:
- rm -f $(filter-out %.sh,$(SBINFILES))
+ rm -f $(filter-out %.sh,$(SBIN
C
FILES))
# Installation targets
# Installation targets
@@
-46,7
+52,7
@@
INSTALL = install
$(addprefix $(ETCDIR)/,conf.d keys):
mkdir -p $@
$(addprefix $(ETCDIR)/,conf.d keys):
mkdir -p $@
-$(ETC
CFG)/cron.sh: rrqnet-cro
n.sh
+$(ETC
DIR)/ifupdown.sh: rrqnet-ifupdow
n.sh
$(INSTALL) -D -T $< $@
$(SBINDIR)/% $(ETCDIR)/% $(MAN1DIR)/% $(MAN8DIR)/%: %
$(INSTALL) -D -T $< $@
$(SBINDIR)/% $(ETCDIR)/% $(MAN1DIR)/% $(MAN8DIR)/%: %