s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add some libs to avoid implicit DSO linking.

Browse Source
This commit is contained in:
Daiki Ueno
2011-02-22 22:08:17 +09:00
parent 16fe4a3565
commit 3f83b578de
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile.am
View File

@ -33,6 +33,7 @@ eekboard_system_client_CFLAGS = \
eekboard_system_client_LDADD = \ eekboard_system_client_LDADD = \
$(top_builddir)/eekboard/libeekboard.la \ $(top_builddir)/eekboard/libeekboard.la \
$(top_builddir)/eek/libeek.la \
$(top_builddir)/eek/libeek-xkl.la \ $(top_builddir)/eek/libeek-xkl.la \
$(GIO2_LIBS) \ $(GIO2_LIBS) \
$(GTK_LIBS) \ $(GTK_LIBS) \
@ -64,6 +65,7 @@ eekboard_server_CFLAGS = \
eekboard_server_LDADD = \ eekboard_server_LDADD = \
$(top_builddir)/eekboard/libeekboard.la \ $(top_builddir)/eekboard/libeekboard.la \
$(top_builddir)/eek/libeek.la \
$(top_builddir)/eek/libeek-gtk.la \ $(top_builddir)/eek/libeek-gtk.la \
$(GIO2_LIBS) \ $(GIO2_LIBS) \
$(GTK_LIBS) $(GTK_LIBS)
@ -82,6 +84,7 @@ eekboard_client_CFLAGS = \
eekboard_client_LDADD = \ eekboard_client_LDADD = \
$(top_builddir)/eekboard/libeekboard.la \ $(top_builddir)/eekboard/libeekboard.la \
$(top_builddir)/eek/libeek.la \
$(GIO2_LIBS) $(GIO2_LIBS)
eekboard_client_SOURCES = client-main.c eekboard_client_SOURCES = client-main.c
@ -98,7 +101,7 @@ eekboard_xml_LDADD = \
$(top_builddir)/eek/libeek-gtk.la \ $(top_builddir)/eek/libeek-gtk.la \
$(GIO2_LIBS) \ $(GIO2_LIBS) \
$(GTK_LIBS) \ $(GTK_LIBS) \
$(LIBXKLAVIER_CFLAGS) $(LIBXKLAVIER_LIBS)
eekboard_xml_headers = xklutil.h eekboard_xml_headers = xklutil.h
eekboard_xml_SOURCES = xklutil.c xml-main.c eekboard_xml_SOURCES = xklutil.c xml-main.c

6
tests/Makefile.am
View File

@ -22,10 +22,10 @@ TESTS = eek-simple-test eek-xkb-test eek-xml-test
noinst_PROGRAMS = $(TESTS) noinst_PROGRAMS = $(TESTS)
eek_simple_test_SOURCES = eek-simple-test.c eek_simple_test_SOURCES = eek-simple-test.c
eek_simple_test_LDADD = $(top_builddir)/eek/libeek.la eek_simple_test_LDADD = $(top_builddir)/eek/libeek.la $(GIO2_LIBS)
eek_xkb_test_SOURCES = eek-xkb-test.c eek_xkb_test_SOURCES = eek-xkb-test.c
eek_xkb_test_LDADD = $(top_builddir)/eek/libeek.la $(top_builddir)/eek/libeek-xkb.la eek_xkb_test_LDADD = $(top_builddir)/eek/libeek.la $(top_builddir)/eek/libeek-xkb.la $(GIO2_LIBS) $(GTK_LIBS)
eek_xml_test_SOURCES = eek-xml-test.c eek_xml_test_SOURCES = eek-xml-test.c
eek_xml_test_LDADD = $(top_builddir)/eek/libeek.la $(top_builddir)/eek/libeek-xkl.la eek_xml_test_LDADD = $(top_builddir)/eek/libeek.la $(top_builddir)/eek/libeek-xkl.la $(GIO2_LIBS) $(GTK_LIBS)