projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace usleep() with nanosleep().
[tinc]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
63af709
..
1c1d8e0
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-5,16
+5,14
@@
sbin_PROGRAMS = tincd tinc sptps_test sptps_keypair
## Make sure version.c is always rebuilt with the latest git information
.PHONY: ${srcdir}/version.c version_git.h
version_git.h:
## Make sure version.c is always rebuilt with the latest git information
.PHONY: ${srcdir}/version.c version_git.h
version_git.h:
- echo >$@
- -(cd $(srcdir) && git describe) && echo '#define GIT_DESCRIPTION "'`(cd $(srcdir) && git describe) | sed 's/release-//'`'"' >$@
+
$(AM_V_GEN)
echo >$@
+ @-(cd $(srcdir) && git describe >/dev/null) && echo '#define GIT_DESCRIPTION "'`(cd $(srcdir) && git describe) | sed 's/release-//'`'"' >$@ ||:
${srcdir}/version.c: version_git.h
if LINUX
sbin_PROGRAMS += sptps_speed
endif
${srcdir}/version.c: version_git.h
if LINUX
sbin_PROGRAMS += sptps_speed
endif
-DEFAULT_INCLUDES =
-
ed25519_SOURCES = \
ed25519/add_scalar.c \
ed25519/ed25519.h \
ed25519_SOURCES = \
ed25519/add_scalar.c \
ed25519/ed25519.h \
@@
-55,8
+53,6
@@
tincd_SOURCES = \
fake-gai-errnos.h \
fake-getaddrinfo.c fake-getaddrinfo.h \
fake-getnameinfo.c fake-getnameinfo.h \
fake-gai-errnos.h \
fake-getaddrinfo.c fake-getaddrinfo.h \
fake-getnameinfo.c fake-getnameinfo.h \
- getopt.c getopt.h \
- getopt1.c \
graph.c graph.h \
hash.c hash.h \
have.h \
graph.c graph.h \
hash.c hash.h \
have.h \
@@
-102,8
+98,6
@@
tincd_SOURCES = \
tinc_SOURCES = \
dropin.c dropin.h \
tinc_SOURCES = \
dropin.c dropin.h \
- getopt.c getopt.h \
- getopt1.c \
fsck.c fsck.h \
info.c info.h \
invitation.c invitation.h \
fsck.c fsck.h \
info.c info.h \
invitation.c invitation.h \
@@
-151,7
+145,22
@@
sptps_speed_SOURCES = \
$(chacha_poly1305_SOURCES)
## Conditionally compile device drivers
$(chacha_poly1305_SOURCES)
## Conditionally compile device drivers
-
+
+if !GETOPT
+tincd_SOURCES += \
+ getopt.c getopt.h \
+ getopt1.c
+tinc_SOURCES += \
+ getopt.c getopt.h \
+ getopt1.cendif
+sptps_test_SOURCES += \
+ getopt.c getopt.h \
+ getopt1.c
+sptps_keypair_SOURCES += \
+ getopt.c getopt.h \
+ getopt1.c
+endif
+
if LINUX
tincd_SOURCES += linux/device.c
endif
if LINUX
tincd_SOURCES += linux/device.c
endif
@@
-251,6
+260,12
@@
sptps_speed_SOURCES += \
endif
endif
endif
endif
+if MINIUPNPC
+tincd_SOURCES += upnp.h upnp.c
+tincd_LDADD = $(MINIUPNPC_LIBS)
+tincd_LDFLAGS = -pthread
+endif
+
tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
sptps_speed_LDADD = -lrt
tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
sptps_speed_LDADD = -lrt