Move code in src

2015-11-11 09:14:35 +01:00
parent e122d76a32
commit 9cf4c97468
7 changed files with 3 additions and 3 deletions
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
 bin_PROGRAMS = glorytun
-glorytun_SOURCES = main.c option.c option.h common.h common-static.h
+glorytun_SOURCES = src/common.h src/common-static.h src/main.c src/option.c src/option.h
 glorytun_CFLAGS = $(libsodium_CFLAGS)
 glorytun_LDADD = $(libsodium_LIBS)
--- a/configure.ac
+++ b/configure.ac
@@ -3,10 +3,10 @@ AC_INIT([glorytun], [0.0.1],
        [https://github.com/angt/glorytun/issues],
        [glorytun],
        [https://github.com/angt/glorytun])
-AM_INIT_AUTOMAKE([1.9 -Wall -Werror foreign tar-ustar])
+AM_INIT_AUTOMAKE([1.9 -Wall -Werror foreign tar-ustar subdir-objects])
 AM_DEP_TRACK
 AM_SILENT_RULES([yes])
-AC_CONFIG_SRCDIR([common.h])
+AC_CONFIG_SRCDIR([src/common.h])
 AC_PROG_CC_C99
 AC_USE_SYSTEM_EXTENSIONS
 AC_SEARCH_LIBS([getaddrinfo], [resolv nsl])
--- a/src/common-static.h
+++ b/src/common-static.h
--- a/src/common.h
+++ b/src/common.h
--- a/src/main.c
+++ b/src/main.c
--- a/src/option.c
+++ b/src/option.c
--- a/src/option.h
+++ b/src/option.h