blob: 1e924be9fd5b658fb641172c7988d7d83f114334 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
Index: stardict/src/Makefile.am
===================================================================
--- stardict/src/Makefile.am (revision 489)
+++ stardict/src/Makefile.am (working copy)
@@ -26,9 +26,9 @@
-DSTARDICT_LIB_DIR=\""$(libdir)/stardict"\"
-stardict_DEPENDENCIES = $(LOCAL_SIGCPP_LIBFILE) lib/libstardict.a
+stardict_DEPENDENCIES = lib/libstardict.a $(LOCAL_SIGCPP_LIBFILE)
stardict_LDFLAGS =
-stardict_LDADD = $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE) lib/libstardict.a
+stardict_LDADD = lib/libstardict.a $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE)
if !GNOME_SUPPORT
if MAEMO_SUPPORT
Index: stardict/tests/Makefile.am
===================================================================
--- stardict/tests/Makefile.am (revision 489)
+++ stardict/tests/Makefile.am (working copy)
@@ -49,7 +49,7 @@
t_res_database_SOURCES = t_res_database.cpp
t_res_database_DEPENDENCIES = $(top_builddir)/src/lib/libstardict.a
-LDADD = @STARDICT_LIBS@ $(top_builddir)/src/lib/libstardict.a \
+LDADD = $(top_builddir)/src/lib/libstardict.a $(STARDICT_LIBS) \
$(LOCAL_SIGCPP_LIBFILE)
## -I$(top_builddir) is for config.h, it's generated by configure in the build dir
AM_CPPFLAGS = @STARDICT_CFLAGS@ $(LOCAL_SIGCPP_INCLUDE) -I$(top_builddir) \
|
