build: Enable seeld build

4 files changed, 93 insertions, 7 deletions

diff --git a/Makefile.am b/Makefile.am
index fc17bdc..40bb36a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,19 +46,67 @@ src_neard_LDFLAGS = -Wl,--export-dynamic
 
 src_neard_DEPENDENCIES= src/neard.service
 
-nodist_src_neard_SOURCES = src/builtin.h
+BUILT_SOURCES = src/builtin.h
 
 AM_CPPFLAGS = ${GLIB_CFLAGS} ${DBUS_CFLAGS} ${NETLINK_CFLAGS} \
-              -DNEAR_PLUGIN_BUILTIN -DPLUGINDIR=\""$(plugindir)"\" \
-              -DCONFIGDIR=\""$(configdir)\"" \
-              -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
+		-DNEAR_PLUGIN_BUILTIN -DPLUGINDIR=\""$(plugindir)"\" \
+		-DCONFIGDIR=\""$(configdir)\"" \
+		-I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
 
-AM_CFLAGS = ${builtin_cflags}
+AM_CFLAGS = ${builtin_cflags} -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
 
-CLEANFILES = src/builtin.h $(local_headers)
+if SE
+
+se_plugin_LTLIBRARIES =
+
+se_plugin_objects =
+
+builtin_se_modules =
+builtin_se_sources =
+builtin_se_libadd =
+builtin_se_cflags =
+
+pkglibexec_PROGRAMS += se/seeld
+
+se_seeld_SOURCES = $(gdbus_sources) $(builtin_se_sources) \
+			src/log.c src/dbus.c src/error.c src/plugin.c \
+			se/main.c se/seel.h se/manager.c se/manager.h \
+			se/se.c se/driver.c se/driver.h se/apdu.c \
+			se/channel.c se/ace.c
+
+se_seeld_LDADD = $(builtin_se_libadd) @GLIB_LIBS@ @DBUS_LIBS@ -ldl
+
+se_seeld_LDFLAGS = -Wl,--export-dynamic
+
+BUILT_SOURCES += se/builtin.h
+endif
+
+src_neard_CFLAGS = ${builtin_cflags} -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
+
+src_neard_CPPFLAGS = ${GLIB_CFLAGS} ${DBUS_CFLAGS} ${NETLINK_CFLAGS} \
+			-DNEAR_PLUGIN_BUILTIN \
+			-DPLUGINDIR=\""$(plugindir)"\" \
+			-DCONFIGDIR=\""$(configdir)\"" \
+			-I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
+
+if SE
+src_seeld_CFLAGS = ${builtin_se_cflags} -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
+
+se_seeld_CPPFLAGS = ${GLIB_CFLAGS} ${DBUS_CFLAGS} ${NETLINK_CFLAGS} \
+					-DNEAR_PLUGIN_BUILTIN \
+					-DPLUGINDIR=\""$(build_se_plugindir)"\" \
+					-DCONFIGDIR=\""$(configdir)\"" \
+					-I$(builddir)/se
+endif
+
+CLEANFILES = src/builtin.h se/builtin.h $(local_headers)
 
 plugindir = $(libdir)/near/plugins
 
+if SE
+se_plugindir = $(libdir)/neard/plugins-se
+endif
+
 configdir = ${sysconfdir}/neard
 
 dist_noinst_DATA = src/main.conf
@@ -68,8 +116,19 @@ dbusdir = ${sysconfdir}/dbus-1/system.d/
 dist_dbus_DATA = src/org.neard.conf
 
 if MAINTAINER_MODE
+
+if SE
+build_se_plugindir = $(abs_top_srcdir)/se/plugins/.libs
+endif
+
 build_plugindir = $(abs_top_srcdir)/plugins/.libs
+
 else
+
+if SE
+build_se_plugindir = $(se_plugindir)
+endif
+
 build_plugindir = $(plugindir)
 endif
 
@@ -128,6 +187,12 @@ tools_nfctool_nfctool_SOURCES = tools/nfctool/main.c \
 
 tools_nfctool_nfctool_LDADD = ${GLIB_LIBS} ${NETLINK_LIBS}
 
+tools_nfctool_nfctool_CPPFLAGS = ${GLIB_CFLAGS} ${DBUS_CFLAGS} ${NETLINK_CFLAGS} \
+			-DNEAR_PLUGIN_BUILTIN \
+			-DPLUGINDIR=\""$(plugindir)"\" \
+			-DCONFIGDIR=\""$(configdir)\"" \
+			-I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
+
 unit_tests = unit/test-ndef-parse unit/test-ndef-build unit/test-snep-read
 
 unit_test_ndef_parse_SOURCES = $(gdbus_sources) src/log.c src/dbus.c \
@@ -163,7 +228,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 
 pkgconfig_DATA = neard.pc
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-tools --disable-systemd
+DISTCHECK_CONFIGURE_FLAGS = --enable-tools --enable-ese --disable-systemd
 
 DISTCLEANFILES = $(pkgconfig_DATA)
 
@@ -183,6 +248,11 @@ src/plugin.$(OBJEXT): src/builtin.h
 src/builtin.h: src/genbuiltin $(builtin_sources)
 	$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
 
+se/plugin.$(OBJEXT): se/builtin.h
+
+se/builtin.h: src/genbuiltin $(builtin_se_sources)
+	$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_se_modules) > $@
+
 $(src_neard_OBJECTS) $(tools_nfctool_nfctool_OBJECTS) $(plugin_objects): $(local_headers)
 
 include/near/version.h: include/version.h
diff --git a/Makefile.plugins b/Makefile.plugins
index aa20149..1d74570 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -37,3 +37,10 @@ builtin_sources += plugins/p2p.c plugins/npp.c \
 				plugins/handover.c plugins/p2p.h \
 				plugins/phdc.c
 endif
+
+if SE
+builtin_se_modules += nfc
+builtin_se_sources += se/plugins/nfc.c
+builtin_se_cflags += @NETLINK_CFLAGS@
+builtin_se_libadd += @NETLINK_LIBS@
+endif
diff --git a/bootstrap-configure b/bootstrap-configure
index 18e9d86..7cb1458 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -9,5 +9,6 @@ fi
 		--enable-debug \
 		--disable-systemd \
 		--prefix=/usr \
+		--enable-ese \
 		--sysconfdir=/etc \
 		--enable-tools "$@"
diff --git a/configure.ac b/configure.ac
index 74aa838..49280df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,7 @@ AC_LANG_C
 AC_PROG_CC
 AC_PROG_CC_PIE
 AC_PROG_INSTALL
+AC_PROG_MKDIR_P
 
 m4_define([_LT_AC_TAGCONFIG], [])
 m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
@@ -171,4 +172,11 @@ AC_ARG_ENABLE(p2p, AC_HELP_STRING([--disable-p2p],
 				[enable_p2p=${enableval}])
 AM_CONDITIONAL(P2P, test "${enable_p2p}" != "no")
 
+AC_ARG_ENABLE(ese, AC_HELP_STRING([--enable-ese],
+				[enable embedded SE support]),
+				[enable_ese=${enableval}])
+AM_CONDITIONAL(ESE, test "${enable_ese}" = "yes")
+
+AM_CONDITIONAL(SE, test "${enable_ese}" = "yes")
+
 AC_OUTPUT(Makefile include/version.h neard.pc)