refactoring sources

Change-Id: Id6d52eee86b706958972e9b345ec0d4d1e488146
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

diff --git a/Makefile.am b/Makefile.am
index 6c76395..f268924 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,32 +1,2 @@
-bin_PROGRAMS = wgtpkg-install wgtpkg-pack wgtpkg-sign
-
-COMMONSRCS = \
-       wgtpkg-base64.c \
-       wgtpkg-certs.c \
-       wgtpkg-digsig.c \
-       wgtpkg-files.c \
-       wgtpkg-verbose.c \
-       wgtpkg-workdir.c \
-       wgtpkg-xmlsec.c \
-       wgtpkg-zip.c
-
-WGTSRCS = \
-       wgt-config-xml.c \
-       wgt-locales.c \
-       wgt-rootdir.c \
-       wgt-strings.c
-
-AM_CFLAGS  = -Wall -Wno-pointer-sign
-AM_CFLAGS += -ffunction-sections -fdata-sections
-AM_CFLAGS += ${ZIP_CFLAGS} ${XML2_CFLAGS} ${OPENSSL_CFLAGS} ${XMLSEC_CFLAGS}
-
-AM_LDFLAGS = -Wl,--gc-sections
-
-LDADD = ${ZIP_LIBS} ${XML2_LIBS} ${OPENSSL_LIBS} ${XMLSEC_LIBS}
-
-wgtpkg_install_SOURCES = wgtpkg-install.c ${WGTSRCS} ${COMMONSRCS}
-
-wgtpkg_sign_SOURCES = wgtpkg-sign.c ${COMMONSRCS}
-
-wgtpkg_pack_SOURCES = wgtpkg-pack.c ${COMMONSRCS}
+SUBDIRS = src
 

diff --git a/configure.ac b/configure.ac
index 5cf0a62..ea099b0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,8 @@ AC_PREREQ([2.69])
 AC_INIT([wgtpkg], [1.0], [wgtpkg@iot.bzh])
 AM_INIT_AUTOMAKE
 #AM_INIT_AUTOMAKE([-Wall -Wno-pointer-sign])
-AC_CONFIG_SRCDIR([wgtpkg-files.c])
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([src/wgtpkg-files.c])
+AC_CONFIG_HEADERS([src/config.h])
 
 # Checks for programs.
 #AC_PROG_CXX
@@ -37,6 +37,8 @@ AC_TYPE_SSIZE_T
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
 AC_CHECK_FUNCS([atexit memmove mkdir realpath rmdir stpcpy strrchr strtoul])
+AC_CHECK_FUNCS([strcasecmp strdup strndup])
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile
+                 src/Makefile])
 AC_OUTPUT

diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644 (file)
index 0000000..6c76395
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,32 @@
+bin_PROGRAMS = wgtpkg-install wgtpkg-pack wgtpkg-sign
+
+COMMONSRCS = \
+       wgtpkg-base64.c \
+       wgtpkg-certs.c \
+       wgtpkg-digsig.c \
+       wgtpkg-files.c \
+       wgtpkg-verbose.c \
+       wgtpkg-workdir.c \
+       wgtpkg-xmlsec.c \
+       wgtpkg-zip.c
+
+WGTSRCS = \
+       wgt-config-xml.c \
+       wgt-locales.c \
+       wgt-rootdir.c \
+       wgt-strings.c
+
+AM_CFLAGS  = -Wall -Wno-pointer-sign
+AM_CFLAGS += -ffunction-sections -fdata-sections
+AM_CFLAGS += ${ZIP_CFLAGS} ${XML2_CFLAGS} ${OPENSSL_CFLAGS} ${XMLSEC_CFLAGS}
+
+AM_LDFLAGS = -Wl,--gc-sections
+
+LDADD = ${ZIP_LIBS} ${XML2_LIBS} ${OPENSSL_LIBS} ${XMLSEC_LIBS}
+
+wgtpkg_install_SOURCES = wgtpkg-install.c ${WGTSRCS} ${COMMONSRCS}
+
+wgtpkg_sign_SOURCES = wgtpkg-sign.c ${COMMONSRCS}
+
+wgtpkg_pack_SOURCES = wgtpkg-pack.c ${COMMONSRCS}
+

diff --git a/wgt-config-xml.c b/src/wgt-config-xml.c
similarity index 100%
rename from wgt-config-xml.c
rename to src/wgt-config-xml.c

diff --git a/wgt-locales.c b/src/wgt-locales.c
similarity index 100%
rename from wgt-locales.c
rename to src/wgt-locales.c

diff --git a/wgt-rootdir.c b/src/wgt-rootdir.c
similarity index 100%
rename from wgt-rootdir.c
rename to src/wgt-rootdir.c

diff --git a/wgt-strings.c b/src/wgt-strings.c
similarity index 100%
rename from wgt-strings.c
rename to src/wgt-strings.c

diff --git a/wgt.h b/src/wgt.h
similarity index 100%
rename from wgt.h
rename to src/wgt.h

diff --git a/wgtpkg-base64.c b/src/wgtpkg-base64.c
similarity index 100%
rename from wgtpkg-base64.c
rename to src/wgtpkg-base64.c

diff --git a/wgtpkg-certs.c b/src/wgtpkg-certs.c
similarity index 100%
rename from wgtpkg-certs.c
rename to src/wgtpkg-certs.c

diff --git a/wgtpkg-digsig.c b/src/wgtpkg-digsig.c
similarity index 100%
rename from wgtpkg-digsig.c
rename to src/wgtpkg-digsig.c

diff --git a/wgtpkg-files.c b/src/wgtpkg-files.c
similarity index 100%
rename from wgtpkg-files.c
rename to src/wgtpkg-files.c

diff --git a/wgtpkg-install.c b/src/wgtpkg-install.c
similarity index 100%
rename from wgtpkg-install.c
rename to src/wgtpkg-install.c

diff --git a/wgtpkg-pack.c b/src/wgtpkg-pack.c
similarity index 100%
rename from wgtpkg-pack.c
rename to src/wgtpkg-pack.c

diff --git a/wgtpkg-sign.c b/src/wgtpkg-sign.c
similarity index 100%
rename from wgtpkg-sign.c
rename to src/wgtpkg-sign.c

diff --git a/wgtpkg-verbose.c b/src/wgtpkg-verbose.c
similarity index 100%
rename from wgtpkg-verbose.c
rename to src/wgtpkg-verbose.c

diff --git a/wgtpkg-workdir.c b/src/wgtpkg-workdir.c
similarity index 100%
rename from wgtpkg-workdir.c
rename to src/wgtpkg-workdir.c

diff --git a/wgtpkg-xmlsec.c b/src/wgtpkg-xmlsec.c
similarity index 100%
rename from wgtpkg-xmlsec.c
rename to src/wgtpkg-xmlsec.c

diff --git a/wgtpkg-zip.c b/src/wgtpkg-zip.c
similarity index 100%
rename from wgtpkg-zip.c
rename to src/wgtpkg-zip.c

diff --git a/wgtpkg.h b/src/wgtpkg.h
similarity index 100%
rename from wgtpkg.h
rename to src/wgtpkg.h