From a966db5b71328f6adf9dd767e64b322a3bd7ed9c Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Fri, 14 Oct 2011 04:13:30 +0200
Subject: fixed build system: link against libslang in correct order

---
 Makefile       | 16 ++++++----------
 c_src/Makefile |  6 +++---
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 579b140..233e742 100644
--- a/Makefile
+++ b/Makefile
@@ -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
-- 
cgit v1.2.3