j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Stop using EXTRA_DIST in src/Makefile.am.

Browse source 
Automake finds the files in the subdirectories of src/ now that they are
properly declared in the _SOURCES variables. Using EXTRA_DIST would now cause
.o files to be included in the tarball.
This commit is contained in:
Guus Sliepen 2013-08-14 16:17:12 +02:00
parent 60e7749428
commit 5e50a56dd9
1 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/Makefile.am
View file

@ -2,8 +2,6 @@
sbin_PROGRAMS = tincd tinc sptps_test sbin_PROGRAMS = tincd tinc sptps_test
EXTRA_DIST = linux bsd solaris cygwin mingw openssl gcrypt
DEFAULT_INCLUDES = DEFAULT_INCLUDES =
tincd_SOURCES = \ tincd_SOURCES = \
@ -96,7 +94,7 @@ endif
if BSD if BSD
tincd_SOURCES += bsd/device.c tincd_SOURCES += bsd/device.c
if TUNEMU if TUNEMU
tincd_SOURCES += bsd/tunemu.c tincd_SOURCES += bsd/tunemu.c bsd/tunemu.h
endif endif
endif endif
@ -105,7 +103,7 @@ tincd_SOURCES += solaris/device.c
endif endif
if MINGW if MINGW
tincd_SOURCES += mingw/device.c tincd_SOURCES += mingw/device.c mingw/common.h
endif endif
if CYGWIN if CYGWIN
@ -124,7 +122,7 @@ if OPENSSL
tincd_SOURCES += \ tincd_SOURCES += \
openssl/cipher.c \ openssl/cipher.c \
openssl/crypto.c \ openssl/crypto.c \
openssl/digest.c \ openssl/digest.c openssl/digest.h \
openssl/ecdh.c \ openssl/ecdh.c \
openssl/ecdsa.c \ openssl/ecdsa.c \
openssl/prf.c \ openssl/prf.c \
@ -132,7 +130,7 @@ tincd_SOURCES += \
tinc_SOURCES += \ tinc_SOURCES += \
openssl/cipher.c \ openssl/cipher.c \
openssl/crypto.c \ openssl/crypto.c \
openssl/digest.c \ openssl/digest.c openssl/digest.h \
openssl/ecdh.c \ openssl/ecdh.c \
openssl/ecdsa.c \ openssl/ecdsa.c \
openssl/ecdsagen.c \ openssl/ecdsagen.c \
@ -142,7 +140,7 @@ tinc_SOURCES += \
sptps_test_SOURCES += \ sptps_test_SOURCES += \
openssl/cipher.c \ openssl/cipher.c \
openssl/crypto.c \ openssl/crypto.c \
openssl/digest.c \ openssl/digest.c openssl/digest.h \
openssl/ecdh.c \ openssl/ecdh.c \
openssl/ecdsa.c \ openssl/ecdsa.c \
openssl/prf.c openssl/prf.c
@ -152,7 +150,7 @@ if GCRYPT
tincd_SOURCES += \ tincd_SOURCES += \
gcrypt/cipher.c \ gcrypt/cipher.c \
gcrypt/crypto.c \ gcrypt/crypto.c \
gcrypt/digest.c \ gcrypt/digest.c gcrypt/digest.h \
gcrypt/ecdh.c \ gcrypt/ecdh.c \
gcrypt/ecdsa.c \ gcrypt/ecdsa.c \
gcrypt/prf.c \ gcrypt/prf.c \
@ -160,7 +158,7 @@ tincd_SOURCES += \
tinc_SOURCES += \ tinc_SOURCES += \
gcrypt/cipher.c \ gcrypt/cipher.c \
gcrypt/crypto.c \ gcrypt/crypto.c \
gcrypt/digest.c \ gcrypt/digest.c gcrypt/digest.h \
gcrypt/ecdh.c \ gcrypt/ecdh.c \
gcrypt/ecdsa.c \ gcrypt/ecdsa.c \
gcrypt/ecdsagen.c \ gcrypt/ecdsagen.c \
@ -170,7 +168,7 @@ tinc_SOURCES += \
sptps_test_SOURCES += \ sptps_test_SOURCES += \
gcrypt/cipher.c \ gcrypt/cipher.c \
gcrypt/crypto.c \ gcrypt/crypto.c \
gcrypt/digest.c \ gcrypt/digest.c gcrypt/digest.h \
gcrypt/ecdh.c \ gcrypt/ecdh.c \
gcrypt/ecdsa.c \ gcrypt/ecdsa.c \
gcrypt/prf.c gcrypt/prf.c
@ -185,6 +183,3 @@ LIBS += -lpcap
endif endif
AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\" AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
dist-hook:
rm -f `find . -type l`