Remove local GIT submodules for libuEv and libite

From now on the user is required to have libuEv and libite installed
before building and installing finit. This is for maintenance reasons.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson
2016-04-09 20:29:26 +02:00
parent 707c42db63
commit ba11d218bc
5 changed files with 8 additions and 32 deletions
-6
View File
@@ -1,6 +0,0 @@
[submodule "libuev"]
path = libuev
url = https://github.com/troglobit/libuev.git
[submodule "libite"]
path = libite
url = https://github.com/troglobit/libite.git
+3 -16
View File
@@ -10,13 +10,12 @@ finit_LDADD = libite/.libs/libite.la libuev/.libs/libuev.la -ldl
if STATIC
finit_LDADD += plugins/libplug.la
endif
DEPENDENCIES = libite/libite.la libuev/libuev.la
DEPENDENCIES = -lite -luev
initctl_SOURCES = initctl.c svc.c helpers.c cond.c
initctl_LDADD = libite/.libs/libite.la
initctl_LDADD = -lite
reboot_SOURCES = reboot.c
SYMLINK = telinit init
#DIST_SUBDIRS = libite libuev
SUBDIRS = libite libuev plugins
SUBDIRS = plugins
doc_DATA = README.md LICENSE finit.conf services
EXTRA_DIST = README.md LICENSE ChangeLog.md finit.conf services
AM_CPPFLAGS = -U_FORTIFY_SOURCE
@@ -25,18 +24,6 @@ AM_CPPFLAGS += -DFINIT_CONF=\"$(conf)\" -DFINIT_RCSD=\"$(rcsd)\" -DFINIT_F
-DPLUGIN_PATH=\"$(pkglibdir)\"
AM_LDFLAGS = -export-dynamic
# Slightly ugly hacks to prevent the build system from installing
# libuev/libite, which it does if we use the more plain SUBDIRS.
#$(DEPENDENCIES):
# @$(MAKE) -C `dirname $@` all
#
#$(initctl_LDADD) $(finit_LDADD): $(DEPENDENCIES)
#
#clean-local:
# @-for dep in $(DEPENDENCIES); do \
# $(MAKE) -C `dirname $$dep` clean; \
# done
# Hook in install to add finit --> telinit symlink(s)
install-exec-hook:
@for file in $(SYMLINK); do \
+5 -8
View File
@@ -7,8 +7,6 @@ AM_SILENT_RULES([yes])
AC_CONFIG_SRCDIR([finit.c])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_FILES([Makefile plugins/Makefile])
AC_CONFIG_FILES([libite/Makefile])
AC_CONFIG_FILES([libuev/Makefile libuev/examples/Makefile])
# Older versions of autoconf (<2.58) do not have AC_CONFIG_MACRO_DIR()
#m4_include([m4/misc.m4])
@@ -20,8 +18,9 @@ AC_PREFIX_DEFAULT([/])
datarootdir=/usr/share
AC_SUBST([datarootdir])
# Default plugins
# Check for plugins
#plugins_all="alsa-utils bootmisc dbus hwclock initctl netlink pidfile resolvconf time tty urandom x11-common"
LT_INIT([shared disable-static dlopen])
# Checks for programs.
AC_PROG_CC
@@ -37,11 +36,9 @@ AC_TYPE_UINT8_T
AC_TYPE_UINT16_T
AC_TYPE_UINT32_T
# Needed for the libraries
AM_PROG_AR
LT_INIT([shared disable-static dlopen])
#LT_INIT([dlopen])
AM_CONDITIONAL([ENABLE_EXAMPLES], [test "$enable_examples" = yes])
# Check for required libraries
PKG_CHECK_MODULES([libuEv], [libuev >= 1.4.0])
PKG_CHECK_MODULES([lite], [libite >= 1.5.0])
# Check for configured Finit features
AC_ARG_ENABLE(embedded,
Submodule libite deleted from 0a57f2128f
Submodule libuev deleted from f856f299e4