projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update .gitignore.
[tinc]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
c3e746f
..
7de9ecb
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-13,8
+13,6
@@
if LINUX
sbin_PROGRAMS += sptps_speed
endif
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 \
@@
-151,7
+147,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
@@
-252,7
+263,7
@@
endif
endif
if MINIUPNPC
endif
if MINIUPNPC
-tincd_SOURCES += upnp.c
+tincd_SOURCES += upnp.
h upnp.
c
tincd_LDADD = $(MINIUPNPC_LIBS)
tincd_LDFLAGS = -pthread
endif
tincd_LDADD = $(MINIUPNPC_LIBS)
tincd_LDFLAGS = -pthread
endif