| 1 |
Index: src/ca/gui/Makefile.am
|
| 2 |
===================================================================
|
| 3 |
--- src/ca/gui/Makefile.am (revision 16348)
|
| 4 |
+++ src/ca/gui/Makefile.am (working copy)
|
| 5 |
@@ -170,6 +170,7 @@
|
| 6 |
# ${OPDIR}/libutil/libutil.a \
|
| 7 |
# ${OPDIR}/libdb/libodb.a
|
| 8 |
|
| 9 |
+if enable_dwarf
|
| 10 |
CodeAnalyst_LDADD= \
|
| 11 |
${top_srcdir}/${CADIR}/libs/libcabba/libCAbba.la \
|
| 12 |
${top_srcdir}/${CADIR}/libs/libca/libCA.la \
|
| 13 |
@@ -181,6 +182,18 @@
|
| 14 |
-lm -L/usr/X11R6/lib \
|
| 15 |
-lpopt -liberty -lpthread \
|
| 16 |
-ldl
|
| 17 |
+else
|
| 18 |
+CodeAnalyst_LDADD= \
|
| 19 |
+ ${top_srcdir}/${CADIR}/libs/libcabba/libCAbba.la \
|
| 20 |
+ ${top_srcdir}/${CADIR}/libs/libca/libCA.la \
|
| 21 |
+ ${top_srcdir}/${CADIR}/libs/libopdata/libopdata.la \
|
| 22 |
+ ${top_srcdir}/${CADIR}/libs/liboutput/lib_tbp_output.la \
|
| 23 |
+ ${op_libs} \
|
| 24 |
+ @QT_LIB@ \
|
| 25 |
+ -lm -L/usr/X11R6/lib \
|
| 26 |
+ -lpopt -liberty -lpthread \
|
| 27 |
+ -ldl
|
| 28 |
+endif
|
| 29 |
|
| 30 |
CodeAnalyst_LDFLAGS= -Wl -fPIC --no-undefined @QT_LDFLAGS@
|
| 31 |
|
| 32 |
Index: src/ca/libs/libcabba/Makefile.am
|
| 33 |
===================================================================
|
| 34 |
--- src/ca/libs/libcabba/Makefile.am (revision 16348)
|
| 35 |
+++ src/ca/libs/libcabba/Makefile.am (working copy)
|
| 36 |
@@ -14,8 +14,13 @@
|
| 37 |
-pipe -Wno-unused -Wno-parentheses ${CA_CXXFLAGS}
|
| 38 |
|
| 39 |
libCAbba_la_LDFLAGS = -Wl -fPIC --no-undefined -version-number ${libVersion}
|
| 40 |
-libCAbba_la_LIBADD = ../libdwarf-20070223/lib/${build_cpu}/libdwarf.a
|
| 41 |
|
| 42 |
+if enable_dwarf
|
| 43 |
+libCAbba_la_LIBADD = ../libdwarf-20070223/lib/${build_cpu}/libdwarf.a
|
| 44 |
+else
|
| 45 |
+libCAbba_la_LIBADD =
|
| 46 |
+endif
|
| 47 |
+
|
| 48 |
libCAbba_la_SOURCES = \
|
| 49 |
disassembler.cpp \
|
| 50 |
smafile.cpp \
|
| 51 |
Index: src/ca/diffgui/Makefile.am
|
| 52 |
===================================================================
|
| 53 |
--- src/ca/diffgui/Makefile.am (revision 16348)
|
| 54 |
+++ src/ca/diffgui/Makefile.am (working copy)
|
| 55 |
@@ -64,6 +64,7 @@
|
| 56 |
icondir=$(prefix)/share/codeanalyst
|
| 57 |
icon_DATA=DiffAnalyst-gui.xpm
|
| 58 |
|
| 59 |
+if enable_dwarf
|
| 60 |
DiffAnalyst_LDADD= \
|
| 61 |
${top_srcdir}/${CADIR}/libs/libca/libCA.la \
|
| 62 |
${top_srcdir}/${CADIR}/libs/libcabba/libCAbba.la \
|
| 63 |
@@ -74,7 +75,19 @@
|
| 64 |
-lm -L/usr/X11R6/lib \
|
| 65 |
-lpthread \
|
| 66 |
-ldl
|
| 67 |
+else
|
| 68 |
+DiffAnalyst_LDADD= \
|
| 69 |
+ ${top_srcdir}/${CADIR}/libs/libca/libCA.la \
|
| 70 |
+ ${top_srcdir}/${CADIR}/libs/libcabba/libCAbba.la \
|
| 71 |
+ ${top_srcdir}/${CADIR}/libs/liboutput/lib_tbp_output.la \
|
| 72 |
+ ${op_libs} \
|
| 73 |
+ @QT_LIB@ \
|
| 74 |
+ -lm -L/usr/X11R6/lib \
|
| 75 |
+ -lpthread \
|
| 76 |
+ -ldl
|
| 77 |
|
| 78 |
+endif
|
| 79 |
+
|
| 80 |
DiffAnalyst_LDFLAGS= -Wl -fPIC --no-undefined @QT_LDFLAGS@
|
| 81 |
|
| 82 |
AM_CPPFLAGS= $(FLAG64) -pipe -DQT_SHARED -DQT_THREAD_SUPPORT \
|