diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2011-10-14 04:13:30 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2011-10-14 04:13:30 +0200 |
| commit | a966db5b71328f6adf9dd767e64b322a3bd7ed9c (patch) | |
| tree | a9827363e73d5870fecf80986d3152a2bf1627c4 | |
| parent | 42b5891ca1fc7ec228058673b44a087c5c06bced (diff) | |
| download | erlang-slang-fork-a966db5b71328f6adf9dd767e64b322a3bd7ed9c.tar.gz | |
fixed build system: link against libslang in correct order
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | c_src/Makefile | 6 |
2 files changed, 9 insertions, 13 deletions
@@ -1,14 +1,10 @@ -export CC ?= gcc -export ERL ?= erl -export RM ?= rm +export CC := gcc +export ERL := erl +export RM := rm -CFLAGS ?= -O2 -CPPFLAGS ?= -LDFLAGS ?= - -override CFLAGS += -Wall - -export CFLAGS CPPFLAGS LDFLAGS +export CFLAGS ?= -O2 +export CPPFLAGS ?= +export LDFLAGS ?= all: $(MAKE) -C c_src $@ diff --git a/c_src/Makefile b/c_src/Makefile index 8a52205..8666699 100644 --- a/c_src/Makefile +++ b/c_src/Makefile @@ -1,14 +1,14 @@ +LIBS := -lslang ERL_CPPFLAGS := $(shell erl -noinput -eval \ 'io:format("-I~s/erts-~s/include", [code:root_dir(), erlang:system_info(version)]), halt(0)') -override CFLAGS += -fPIC +override CFLAGS += -Wall -fpic override CPPFLAGS += $(ERL_CPPFLAGS) -override LDFLAGS += -shared -lslang all : ../priv/slang_drv.so ../priv/slang_drv.so : slang_drv.o - $(CC) $(LDFLAGS) -o $@ $^ + $(CC) -shared $(LDFLAGS) -o $@ $^ $(LIBS) clean: $(RM) -f *.o ../priv/slang_drv.so |