build: Core plugins should be builtin

There is no valid reasons for building the current plugins as libraries.
All of them are either buitin or disabled now.

diff --git a/Makefile.plugins b/Makefile.plugins
index c80f4d4..e561f8f 100644 (file)
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -4,65 +4,27 @@ plugin_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \
 plugin_ldflags = -no-undefined -module -avoid-version
 
 if NFCTYPE1
-if NFCTYPE1_BUILTIN
 builtin_modules += nfctype1
 builtin_sources += plugins/nfctype1.c
-else
-plugin_LTLIBRARIES += plugins/nfctype1.la
-plugin_objects += $(plugins_nfctype1_la_OBJECTS)
-plugins_nfctype1_la_CFLAGS = $(plugin_cflags)
-plugins_nfctype1_la_LDFLAGS = $(plugin_ldflags)
-endif
 endif
 
 if NFCTYPE2
-if NFCTYPE2_BUILTIN
 builtin_modules += nfctype2
 builtin_sources += plugins/nfctype2.c plugins/mifare.c
-else
-plugin_LTLIBRARIES += plugins/nfctype2.la
-plugin_objects += $(plugins_nfctype2_la_OBJECTS)
-plugins_nfctype2_la_SOURCES = plugins/nfctype2.c plugins/mifare.c
-plugins_nfctype2_la_CFLAGS = $(plugin_cflags)
-plugins_nfctype2_la_LDFLAGS = $(plugin_ldflags)
-endif
 endif
 
 if NFCTYPE3
-if NFCTYPE3_BUILTIN
 builtin_modules += nfctype3
 builtin_sources += plugins/nfctype3.c
-else
-plugin_LTLIBRARIES += plugins/nfctype3.la
-plugin_objects += $(plugins_nfctype3_la_OBJECTS)
-plugins_nfctype3_la_CFLAGS = $(plugin_cflags)
-plugins_nfctype3_la_LDFLAGS = $(plugin_ldflags)
-endif
 endif
 
 if NFCTYPE4
-if NFCTYPE4_BUILTIN
 builtin_modules += nfctype4
 builtin_sources += plugins/nfctype4.c
-else
-plugin_LTLIBRARIES += plugins/nfctype4.la
-plugin_objects += $(plugins_nfctype4_la_OBJECTS)
-plugins_nfctype4_la_CFLAGS = $(plugin_cflags)
-plugins_nfctype4_la_LDFLAGS = $(plugin_ldflags)
-endif
 endif
 
 if P2P
-if P2P_BUILTIN
 builtin_modules += p2p
 builtin_sources += plugins/p2p.c plugins/npp.c plugins/snep.c \
                                plugins/handover.c plugins/p2p.h
-else
-plugin_LTLIBRARIES += plugins/p2p.la
-plugin_objects += $(plugins_p2p_la_OBJECTS)
-plugins_p2p_la_SOURCES = plugins/p2p.c plugins/npp.c plugins/snep.c \
-                                       plugins/handover.c plugins/p2p.h
-plugins_p2p_la_CFLAGS = $(plugin_cflags)
-plugins_p2p_la_LDFLAGS = $(plugin_ldflags)
-endif
 endif

diff --git a/configure.ac b/configure.ac
index 51e8e9f..e88de29 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -102,30 +102,25 @@ AC_ARG_ENABLE(nfctype1, AC_HELP_STRING([--disable-nfctype1],
                                [disable NFC forum type 1 tags support]),
                                [enable_nfctype1=${enableval}])
 AM_CONDITIONAL(NFCTYPE1, test "${enable_nfctype1}" != "no")
-AM_CONDITIONAL(NFCTYPE1_BUILTIN, test "${enable_nfctype1}" = "builtin")
 
 AC_ARG_ENABLE(nfctype2, AC_HELP_STRING([--disable-nfctype2],
                                [disable NFC forum type 2 tags support]),
                                [enable_nfctype2=${enableval}])
 AM_CONDITIONAL(NFCTYPE2, test "${enable_nfctype2}" != "no")
-AM_CONDITIONAL(NFCTYPE2_BUILTIN, test "${enable_nfctype2}" = "builtin")
 
 AC_ARG_ENABLE(nfctype3, AC_HELP_STRING([--disable-nfctype3],
                                [disable NFC forum type 3 tags support]),
                                [enable_nfctype3=${enableval}])
 AM_CONDITIONAL(NFCTYPE3, test "${enable_nfctype3}" != "no")
-AM_CONDITIONAL(NFCTYPE3_BUILTIN, test "${enable_nfctype3}" = "builtin")
 
 AC_ARG_ENABLE(nfctype4, AC_HELP_STRING([--disable-nfctype4],
                                [disable NFC forum type 4 tags support]),
                                [enable_nfctype4=${enableval}])
 AM_CONDITIONAL(NFCTYPE4, test "${enable_nfctype4}" != "no")
-AM_CONDITIONAL(NFCTYPE4_BUILTIN, test "${enable_nfctype4}" = "builtin")
 
 AC_ARG_ENABLE(p2p, AC_HELP_STRING([--disable-p2p],
                                [disable NFC peer to peer support]),
                                [enable_p2p=${enableval}])
 AM_CONDITIONAL(P2P, test "${enable_p2p}" != "no")
-AM_CONDITIONAL(P2P_BUILTIN, test "${enable_p2p}" = "builtin")
 
 AC_OUTPUT(Makefile include/version.h neard.pc)