summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorUlrich Drepper <[email protected]>2005-08-07 04:41:39 +0000
committerUlrich Drepper <[email protected]>2005-08-07 04:41:39 +0000
commit47be795df365174601a08535bf61d22301697ef8 (patch)
tree016407cd67ef07066784632ffa1a04f059dce6a7 /src
parentca2db8a3ae7bbcbaa8aa314d06608683e694d2df (diff)
Implement --enable-gprof option in configure script.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/Makefile.am21
2 files changed, 16 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6533861b..cf315fff 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-06 Ulrich Drepper <[email protected]>
+
+ * Makefile.am (AM_CFLAGS): Avoid duplication.
+ Link with statis libs if BUILD_STATIC.
+
2005-08-05 Ulrich Drepper <[email protected]>
* elflint.c: Many, many more tests. Mostly related to symbol
diff --git a/src/Makefile.am b/src/Makefile.am
index 5229dce3..73c82dc6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,18 +15,15 @@
DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) \
-DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\"
if MUDFLAP
-AM_CFLAGS = -Wall -Wshadow -Wunused -Wextra -std=gnu99 -fmudflap \
- $(native_ld_cflags) $(if $($(*F)_no_Wunused),,-Wunused) \
- $(if $($(*F)_no_Wformat),,-Wformat=2)
+AM_CFLAGS = -fmudflap
else
-AM_CFLAGS = -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \
- $(if $($(*F)_no_Werror),,-Werror) \
- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
- $(if $($(*F)_no_Wformat),,-Wformat=2)
-endif
-if MUDFLAP
-libmudflap = -lmudflap
+AM_CFLAGS =
endif
+AM_CFLAGS += -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \
+ $(if $($(*F)_no_Werror),,-Werror) \
+ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
+ $(if $($(*F)_no_Wformat),,-Wformat=2)
+
INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl -I$(srcdir)/../lib -I$(srcdir)/../libdw -I..
YACC = @YACC@ -d
@@ -64,6 +61,10 @@ EXTRA_DIST = elf32-i386.script libld_elf_i386.map $(ld_modules)
ld_modules = i386_ld.c
if MUDFLAP
+libmudflap = -lmudflap
+endif
+
+if BUILD_STATIC
libdw = ../libdw/libdw.a
libelf = ../libelf/libelf.a
else