Commit 97c6c389 authored by jdelange's avatar jdelange

* make/Makefile.common

   - Adapt the buildsystem to use our in-house LUA libraries



git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/po-hi-c@3750 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent 5a5673f9
......@@ -290,7 +290,7 @@ endif
ifeq ($(TARGET), $(filter $(TARGET), native bench linux32 linux64 linux32-xenomai-posix linux32-xenomai-native))
$(BINARY): generate-asn1-deployment target-objects compile-po-hi $(USER_OBJS) $(GENERATED_OBJS) $(TARGET_OBJECTS)
$(CC) -o $(BINARY) $(EXTERNAL_OBJECTS) $(PO_HI_OBJS) $(GENERATED_OBJS) $(USER_OBJS) $(LDFLAGS)
$(CC) -o $(BINARY) $(EXTERNAL_OBJECTS) $(PO_HI_OBJS) $(GENERATED_OBJS) $(USER_OBJS) $(LDFLAGS)
endif
ifeq ($(TARGET), arm.dslinux)
......
......@@ -29,7 +29,8 @@ TARGET_CFLAGS = -DRTEMS_PURE -DLEON_RTEMS $(GCC_GENERIC_FLAGS)
TARGET_INCLUDE = -I $(RUNTIME_PATH)/config/leon-rtems/
LD = sparc-rtems-ld
TARGET_LDFLAGS = -lrtemsbsp -lc -lm
TARGET_LDFLAGS = -lrtemsbsp -lc -lm $(RUNTIME_PATH)/libs/leon/liblua.a -lm -L$(RUNTIME_PATH)/libs/leon/ -llua -lm
EXTERNAL_OBJECTS += -L$(RUNTIME_PATH)/libs/leon/ -llua -lm
target-clean:
......@@ -40,12 +41,12 @@ target-clean:
define bsp-link-c
$(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
-o $(BINARY) $(LINK_OBJS) $(LINK_LIBS)
-o $(BINARY) $(LINK_OBJS) $(LINK_LIBS) $(RUNTIME_PATH)/libs/leon/liblua.a -lm -L$(RUNTIME_PATH)/libs/leon/ -llua -lm
endef
define bsp-link-cxx
$(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
-o $(BINARY) $(LINK_OBJS) $(LINK_LIBS)
-o $(BINARY) $(LINK_OBJS) $(LINK_LIBS) $(RUNTIME_PATH)/libs/leon/liblua.a -lm -L$(RUNTIME_PATH)/libs/leon/ -llua -lm
endef
ifdef USE_GPROF
......
......@@ -29,7 +29,8 @@ TARGET_CFLAGS = -DRTEMS_POSIX -DLEON_RTEMS $(GCC_GENERIC_FLAGS)
TARGET_INCLUDE = -I $(RUNTIME_PATH)/config/leon-rtems/
LD = sparc-rtems-ld
TARGET_LDFLAGS = -lrtemsbsp -lc -lm
TARGET_LDFLAGS = -lrtemsbsp -lc -lm
EXTERNAL_OBJECTS += -L$(RUNTIME_PATH)/libs/leon/ -llua -lm
target-clean:
......
TARGET_CFLAGS = -DPOSIX -m32 -D_POSIX_SOURCE -D_GNU_SOURCE $(GCC_GENERIC_FLAGS)
TARGET_LDFLAGS = -lpthread -lrt -m32
TARGET_LDFLAGS = -lpthread -lrt -m32 -L$(RUNTIME_PATH)/libs/linux32/ -llua -lm
SIMULINK_LDFLAGS = -lm
CC = gcc
LD = ld
......
TARGET_CFLAGS = -DPOSIX -m64 -D_POSIX_SOURCE -D_GNU_SOURCE $(GCC_GENERIC_FLAGS)
TARGET_LDFLAGS = -lpthread -lrt -m64
TARGET_LDFLAGS = -lpthread -lrt -m64 -L$(RUNTIME_PATH)/libs/linux64/ -llua -lm
SIMULINK_LDFLAGS = -lm
CC = gcc
LD = ld
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment