From: Michel Pollet <buserror@gmail.com>
Date: Fri, 2 Mar 2012 14:37:09 +0000 (+0000)
Subject: misc: Explicitely link libelf
X-Git-Tag: v1.0b1~31
X-Git-Url: https://git.htl-mechatronik.at/public/?a=commitdiff_plain;h=e161b07644dec9d57640bc20d0256598e0caf5c9;p=sx%2Fsimavr.git

misc: Explicitely link libelf

Some linker don't understand inherited links

Signed-off-by: Michel Pollet <buserror@gmail.com>
---

diff --git a/Makefile.common b/Makefile.common
index f781c16..d476d83 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -35,7 +35,6 @@ endif
 
 CFLAGS		+= -g --std=gnu99 -Wall
 CFLAGS		+= ${patsubst %,-I%,${subst :, ,${IPATH}}}
-LDFLAGS 	+= -lelf 
 
 ifeq (${shell uname}, Darwin)
 AVR_ROOT 	:= "/Applications/Arduino.app/Contents/Resources/Java/hardware/tools/avr/"
@@ -62,6 +61,8 @@ OBJ 		= obj-${shell $(CC) -dumpmachine}
 LIBDIR		= ${shell pwd}/${SIMAVR}/${OBJ}
 LDFLAGS 	+= -L${LIBDIR} -lsimavr 
 
+LDFLAGS 	+= -lelf 
+
 ifeq (${shell uname}, Linux)
 # allow the shared library to be found in the build directory
 LFLAGS		+= -Wl,-rpath,${LIBDIR}
diff --git a/simavr/simavr.pc b/simavr/simavr.pc
index 87607fb..c1e9ba9 100644
--- a/simavr/simavr.pc
+++ b/simavr/simavr.pc
@@ -8,7 +8,7 @@ Name: simavr
 Description: Atmel(tm) AVR 8 bits simulator
 Version: VERSION
 Cflags: -I${includedir}
-Libs: -L${libdir} -lsimavr
+Libs: -L${libdir} -lsimavr -lelf
 
 simavr-avr.pc:
 prefix=PREFIX
@@ -22,5 +22,5 @@ Version: VERSION
 Cflags: -I${includedir}/avr -ffunction-sections -fdata-sections \
 			-Wl,--relax,--gc-sections \
 			-Wl,--undefined=_mmcu,--section-start=.mmcu=0x910000
-Libs: -L${libdir} -lsimavr
+Libs: