1
0
Fork 0
mirror of https://github.com/albfan/miraclecast.git synced 2025-03-09 23:38:56 +00:00

Move shared helpers into ./src/shared/

Move all shared helpers into a separate subdirectory and rename to
libmiracle-shared.la.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
This commit is contained in:
David Herrmann 2014-02-18 13:56:12 +01:00
parent fc30d8b920
commit 47539226cd
9 changed files with 19 additions and 20 deletions

View file

@ -52,6 +52,7 @@ AM_CFLAGS = \
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-include $(top_builddir)/config.h \ -include $(top_builddir)/config.h \
-I $(srcdir)/src \ -I $(srcdir)/src \
-I $(srcdir)/src/shared \
-I /usr/local/include \ -I /usr/local/include \
-DBUILD_ENABLE_DEBUG \ -DBUILD_ENABLE_DEBUG \
'-DBUILD_BINDIR="$(bindir)"' '-DBUILD_BINDIR="$(bindir)"'
@ -64,25 +65,23 @@ AM_LIBADD = \
-lsystemd -lsystemd
# #
# SHL - Static Helper Library # Shared Helpers
# The SHL subsystem contains several small code pieces used all over libwfd and
# other applications.
# #
noinst_LTLIBRARIES += libshl.la noinst_LTLIBRARIES += libmiracle-shared.la
libshl_la_SOURCES = \ libmiracle_shared_la_SOURCES = \
src/shl_dlist.h \ src/shared/shl_dlist.h \
src/shl_htable.h \ src/shared/shl_htable.h \
src/shl_htable.c \ src/shared/shl_htable.c \
src/shl_log.h \ src/shared/shl_log.h \
src/shl_log.c \ src/shared/shl_log.c \
src/shl_macro.h \ src/shared/shl_macro.h \
src/shl_util.h \ src/shared/shl_util.h \
src/shl_util.c src/shared/shl_util.c
libshl_la_CPPFLAGS = $(AM_CPPFLAGS) libmiracle_shared_la_CPPFLAGS = $(AM_CPPFLAGS)
libshl_la_LDFLAGS = $(AM_LDFLAGS) libmiracle_shared_la_LDFLAGS = $(AM_LDFLAGS)
libshl_la_LIBADD = $(AM_LIBADD) libmiracle_shared_la_LIBADD = $(AM_LIBADD)
# #
# gdhcp - dhcp implementation # gdhcp - dhcp implementation
@ -119,7 +118,7 @@ miraclectl_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
$(DEPS_CFLAGS) $(DEPS_CFLAGS)
miraclectl_LDADD = \ miraclectl_LDADD = \
libshl.la \ libmiracle-shared.la \
-lreadline \ -lreadline \
$(DEPS_LIBS) $(DEPS_LIBS)
miraclectl_LDFLAGS = $(AM_LDFLAGS) miraclectl_LDFLAGS = $(AM_LDFLAGS)
@ -137,7 +136,7 @@ miracle_dhcp_CPPFLAGS = \
$(DEPS_CFLAGS) \ $(DEPS_CFLAGS) \
$(GDHCP_CFLAGS) $(GDHCP_CFLAGS)
miracle_dhcp_LDADD = \ miracle_dhcp_LDADD = \
libshl.la \ libmiracle-shared.la \
libgdhcp.la \ libgdhcp.la \
$(DEPS_LIBS) \ $(DEPS_LIBS) \
$(GDHCP_LIBS) $(GDHCP_LIBS)
@ -160,7 +159,7 @@ miracled_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
$(DEPS_CFLAGS) $(DEPS_CFLAGS)
miracled_LDADD = \ miracled_LDADD = \
libshl.la \ libmiracle-shared.la \
$(DEPS_LIBS) $(DEPS_LIBS)
miracled_LDFLAGS = $(AM_LDFLAGS) miracled_LDFLAGS = $(AM_LDFLAGS)
@ -178,7 +177,7 @@ endif
test_sources = \ test_sources = \
test/test_common.h test/test_common.h
test_libs = \ test_libs = \
libshl.la \ libmiracle-shared.la \
$(DEPS_LIBS) \ $(DEPS_LIBS) \
$(CHECK_LIBS) $(CHECK_LIBS)
test_cflags = \ test_cflags = \