diff options
Diffstat (limited to 'src/format')
| -rw-r--r-- | src/format/Makefile.am | 11 | ||||
| -rw-r--r-- | src/format/dwarf/Makefile.am | 6 | ||||
| -rw-r--r-- | src/format/elf/Makefile.am | 8 | ||||
| -rw-r--r-- | src/format/elf/e_elf.c | 6 | ||||
| -rwxr-xr-x | src/format/java/Makefile.am | 6 | ||||
| -rw-r--r-- | src/format/mangling/Makefile.am | 6 | ||||
| -rwxr-xr-x | src/format/pe/Makefile.am | 6 |
7 files changed, 27 insertions, 22 deletions
diff --git a/src/format/Makefile.am b/src/format/Makefile.am index baf11de..41d7120 100644 --- a/src/format/Makefile.am +++ b/src/format/Makefile.am @@ -1,13 +1,18 @@ -lib_LIBRARIES = libformat.a +lib_LTLIBRARIES = libformat.la -libformat_a_SOURCES = \ +libformat_la_SOURCES = \ exe_format.h exe_format.c \ exe_format-int.h \ dbg_format.h dbg_format.c \ dbg_format-int.h -libformat_a_CFLAGS = $(AM_CFLAGS) +libformat_la_LDFLAGS = $(LIBGTK_LIBS) \ + -Ldwarf/.libs -lformatdwarf \ + -Lelf/.libs -lformatelf \ + -Ljava/.libs -lformatjava \ + -Lmangling/.libs -lformatmangling \ + -Lpe/.libs -lformatpe INCLUDES = $(LIBGTK_CFLAGS) diff --git a/src/format/dwarf/Makefile.am b/src/format/dwarf/Makefile.am index 0c36205..d5853c3 100644 --- a/src/format/dwarf/Makefile.am +++ b/src/format/dwarf/Makefile.am @@ -1,14 +1,14 @@ -lib_LIBRARIES = libformatdwarf.a +lib_LTLIBRARIES = libformatdwarf.la -libformatdwarf_a_SOURCES = \ +libformatdwarf_la_SOURCES = \ abbrev.h abbrev.c \ d_dwarf.h d_dwarf.c \ dwarf_def.h \ info.h info.c \ utils.h utils.c -libformatdwarf_a_CFLAGS = $(AM_CFLAGS) +libformatdwarf_la_LDFLAGS = $(LIBGTK_LIBS) INCLUDES = diff --git a/src/format/elf/Makefile.am b/src/format/elf/Makefile.am index 663194e..c64fc5c 100644 --- a/src/format/elf/Makefile.am +++ b/src/format/elf/Makefile.am @@ -1,14 +1,16 @@ -lib_LIBRARIES = libformatelf.a +lib_LTLIBRARIES = libformatelf.la -libformatelf_a_SOURCES = \ +libformatelf_la_SOURCES = \ e_elf.h e_elf.c \ elf-int.h \ section.h section.c \ strings.h strings.c \ symbol.h symbol.c -libformatelf_a_CFLAGS = $(AM_CFLAGS) +libformatelf_la_LDFLAGS = $(LIBGTK_LIBS) \ + -L../../common/.libs -common \ + -L../../arch/.libs -larch INCLUDES = $(LIBGTK_CFLAGS) diff --git a/src/format/elf/e_elf.c b/src/format/elf/e_elf.c index 1a1fe8d..c52a304 100644 --- a/src/format/elf/e_elf.c +++ b/src/format/elf/e_elf.c @@ -33,6 +33,7 @@ #include "strings.h" #include "symbol.h" #include "../../panel/log.h" +#include "../../common/extstr.h" @@ -47,9 +48,6 @@ uint64_t get_elf_entry_point(const elf_format *); -/* S'assure qu'une chaîne de caractère tient sur une ligne. */ -extern char *escape_crlf_bin_string(char *); - /* Récupère tous les éléments identifiées dans le binaire. */ size_t get_elf_resolved_items(const elf_format *, char ***, ResolvedType **, uint64_t **); @@ -462,7 +460,7 @@ size_t get_elf_resolved_items(const elf_format *format, char ***labels, Resolved (*types)[start + i] = RTP_STRING; (*offsets)[start + i] = format->strings[i].vaddress; - (*labels)[start + i] = escape_crlf_bin_string((*labels)[start + i]); + (*labels)[start + i] = escape_crlf((*labels)[start + i]); } diff --git a/src/format/java/Makefile.am b/src/format/java/Makefile.am index f94466d..9f59f61 100755 --- a/src/format/java/Makefile.am +++ b/src/format/java/Makefile.am @@ -1,7 +1,7 @@ -lib_LIBRARIES = libformatjava.a +lib_LTLIBRARIES = libformatjava.la -libformatjava_a_SOURCES = \ +libformatjava_la_SOURCES = \ attribute.h attribute.c \ e_java.h e_java.c \ field.h field.c \ @@ -9,7 +9,7 @@ libformatjava_a_SOURCES = \ method.h method.c \ pool.h pool.c -libformatjava_a_CFLAGS = $(AM_CFLAGS) +libformatjava_la_LDFLAGS = $(LIBGTK_LIBS) INCLUDES = $(LIBGTK_CFLAGS) diff --git a/src/format/mangling/Makefile.am b/src/format/mangling/Makefile.am index 3f7acc5..0823ffc 100644 --- a/src/format/mangling/Makefile.am +++ b/src/format/mangling/Makefile.am @@ -3,15 +3,15 @@ BUILT_SOURCES = itanium_gram.h AM_YFLAGS = -d -lib_LIBRARIES = libformatmangling.a +lib_LTLIBRARIES = libformatmangling.la -libformatmangling_a_SOURCES = \ +libformatmangling_la_SOURCES = \ demangler.h demangler.c \ itanium.h \ itanium_gram.y \ itanium_tok.l -libformatmangling_a_CFLAGS = $(AM_CFLAGS) +libformatmangling_la_LDFLAGS = $(LIBGTK_LIBS) INCLUDES = $(LIBGTK_CFLAGS) diff --git a/src/format/pe/Makefile.am b/src/format/pe/Makefile.am index cf47c4e..9167577 100755 --- a/src/format/pe/Makefile.am +++ b/src/format/pe/Makefile.am @@ -1,11 +1,11 @@ -lib_LIBRARIES = libformatpe.a +lib_LTLIBRARIES = libformatpe.la -libformatpe_a_SOURCES = \ +libformatpe_la_SOURCES = \ e_pe.h e_pe.c \ pe-int.h -libformatpe_a_CFLAGS = $(AM_CFLAGS) +libformatpe_la_LDFLAGS = $(LIBGTK_LIBS) INCLUDES = |