X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2FMakefile.am;h=7de9ecb7253fef44f2be73a8706c3c807be71d79;hb=8be447ac0227a8ecb89facb2831c121a7ca81748;hp=c3e746f62535df2a5bebd295fbd60cbf630de2ef;hpb=513bffe1fee07bcbcb50691e221874adc1507857;p=tinc

diff --git a/src/Makefile.am b/src/Makefile.am
index c3e746f6..7de9ecb7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,8 +13,6 @@ if LINUX
 sbin_PROGRAMS += sptps_speed
 endif
 
-DEFAULT_INCLUDES =
-
 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 \
-	getopt.c getopt.h \
-	getopt1.c \
 	graph.c graph.h \
 	hash.c hash.h \
 	have.h \
@@ -151,7 +147,22 @@ sptps_speed_SOURCES = \
 	$(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
@@ -252,7 +263,7 @@ endif
 endif
 
 if MINIUPNPC
-tincd_SOURCES += upnp.c
+tincd_SOURCES += upnp.h upnp.c
 tincd_LDADD = $(MINIUPNPC_LIBS)
 tincd_LDFLAGS = -pthread
 endif