-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
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
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
--- /dev/null
+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}
+