wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-30 12:50:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build and install temporarily

Browse Source 
This patch builds Finit dynamically, including both plugins and GIT
submodules for libite and libuev.  This causes libite.so and libuev.so
to be installed in a public path, which is not good if the user has
other versions of the same libraries already installed.

The correct fix is to remove the GIT submodules for now and require
users of Finit to build and install libite and libuev separately.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2016-03-19 22:54:07 +01:00
1 parent eb86a76a0d
commit 98cd6dffb1
1 file changed
+13 -11
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+13 -11
View File
@@ -6,17 +6,17 @@ if INETD
finit_SOURCES += inetd.c finit_SOURCES += inetd.c
endif endif
finit_CFLAGS = -W -Wall -Wextra -std=gnu99 finit_CFLAGS = -W -Wall -Wextra -std=gnu99
finit_LDADD = libite/libite.la libuev/libuev.la -ldl finit_LDADD = libite/.libs/libite.la libuev/.libs/libuev.la -ldl
if STATIC if STATIC
finit_LDADD += plugins/libplug.la finit_LDADD += plugins/libplug.la
endif endif
DEPENDENCIES = libite/libite.la libuev/libuev.la DEPENDENCIES = libite/libite.la libuev/libuev.la
initctl_SOURCES = initctl.c svc.c helpers.c cond.c initctl_SOURCES = initctl.c svc.c helpers.c cond.c
initctl_LDADD = libite/libite.la initctl_LDADD = libite/.libs/libite.la
reboot_SOURCES = reboot.c reboot_SOURCES = reboot.c
SYMLINK = telinit init SYMLINK = telinit init
DIST_SUBDIRS = libite libuev #DIST_SUBDIRS = libite libuev
SUBDIRS = plugins SUBDIRS = libite libuev plugins
doc_DATA = README.md LICENSE finit.conf services doc_DATA = README.md LICENSE finit.conf services
EXTRA_DIST = README.md LICENSE ChangeLog.md finit.conf services EXTRA_DIST = README.md LICENSE ChangeLog.md finit.conf services
AM_CPPFLAGS = -U_FORTIFY_SOURCE AM_CPPFLAGS = -U_FORTIFY_SOURCE
@@ -26,13 +26,15 @@ AM_CPPFLAGS += -DFINIT_CONF=\"$(conf)\" -DFINIT_RCSD=\"$(rcsd)\" -DFINIT_F
# Slightly ugly hacks to prevent the build system from installing # Slightly ugly hacks to prevent the build system from installing
# libuev/libite, which it does if we use the more plain SUBDIRS. # libuev/libite, which it does if we use the more plain SUBDIRS.
$(DEPENDENCIES): #$(DEPENDENCIES):
@$(MAKE) -C `dirname $@` all # @$(MAKE) -C `dirname $@` all
#
clean-local: #$(initctl_LDADD) $(finit_LDADD): $(DEPENDENCIES)
@-for dep in $(DEPENDENCIES); do \ #
$(MAKE) -C `dirname $$dep` clean; \ #clean-local:
done # @-for dep in $(DEPENDENCIES); do \
# $(MAKE) -C `dirname $$dep` clean; \
# done
# Hook in install to add finit --> telinit symlink(s) # Hook in install to add finit --> telinit symlink(s)
install-exec-hook: install-exec-hook: