blob: 4a135dff249851c49b7ac2f832eca9346cb6347e (
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
30
31
32
33
34
35
36
37
38
39
40
41
42
|
Upstream-Status: Inappropriate [configuration]
Explicitly add linkage to lttvwindow.
Without the fix, lttv-gui inside target can't run, complaining
"undefined symbol: LTTV_VIEWER_CONSTRUCTORS".
Tue May 3 21:39:37 CST 2011
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
diff --git a/lttv/modules/gui/common.am b/lttv/modules/gui/common.am
index ce50113..89083aa 100644
--- a/lttv/modules/gui/common.am
+++ b/lttv/modules/gui/common.am
@@ -21,3 +21,4 @@ AM_LDFLAGS = $(MODULE_LDFLAGS)
libdir = ${lttvplugindir}
+LIBS += $(GTK_LIBS) -L${top_builddir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am b/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
index c953fc9..489d640 100644
--- a/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
@@ -1,13 +1,14 @@
## Process this file with automake to produce Makefile.in
-include ../../common.am
-
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
$(DEFAULT_INCLUDES)
-#libdir = ${lttvplugindir}
+AM_CFLAGS = $(MODULE_CFLAGS)
+AM_LDFLAGS = $(MODULE_LDFLAGS)
+
+libdir = ${lttvplugindir}
lib_LTLIBRARIES = liblttvwindow.la
|
