--- asap-3.1.3/Makefile.orig	2012-09-08 11:07:08.000000000 +0200
+++ asap-3.1.3/Makefile	2013-04-13 07:42:52.750361640 +0200
@@ -1,11 +1,18 @@
 prefix := /usr/local
+libdir := $(prefix)/lib
 srcdir := $(dir $(lastword $(MAKEFILE_LIST)))
-CC = $(DO)gcc -s -O2 -Wall -o $@ $(if $(filter %.so,$@),-shared -fPIC) $(INCLUDEOPTS) $(filter %.c,$^)
-AR = $(DO)ar rc $@ $^
+CC=gcc
+CFLAGS="-O2 -Wall"
+LDFLAGS="-s"
+LIBTOOL=libtool
+COMPLINK = $(DO)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(if $(filter %.so,$@),-shared -fPIC) $(INCLUDEOPTS) $(CPPFLAGS) $(filter %.c,$^)
+LTCOMPILE = $(DO)$(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CFLAGS) -o $@ $(INCLUDEOPTS) $(CPPFLAGS) $(filter %.c,$^)
+LIBLINK = $(DO)$(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ -rpath $(libdir)
 CITO = $(DO)cito.exe -o $@ $(patsubst %,-I %,$(sort $(dir $(filter-out %.ci,$^)))) $(filter %.ci,$^)
 INSTALL = install
 INSTALL_PROGRAM = mkdir -p $(DESTDIR)$(2) && $(INSTALL) $(1) $(DESTDIR)$(2)/$(1)
 INSTALL_DATA = mkdir -p $(DESTDIR)$(2) && $(INSTALL) -m 644 $(1) $(DESTDIR)$(2)/$(1)
+LTINSTALL = mkdir -p $(DESTDIR)$(2) && $(LIBTOOL) --mode=install $(INSTALL) $(1) $(DESTDIR)$(2)/$(1)
 ASCIIDOC = $(DO)asciidoc -o - $(1) $< | sed -e "s/527bbd;/c02020;/" | xmllint --valid --nonet -o $@ -
 SDL_CFLAGS = `sdl-config --cflags`
 SDL_LIBS = `sdl-config --libs`
@@ -27,7 +34,7 @@
 CLEAN :=
 CLEANDIR :=
 
-all: asapconv libasap.a
+all: asapconv libasap.la
 .PHONY: all
 
 install: install-asapconv install-lib
@@ -41,7 +48,7 @@
 # asapconv
 
 asapconv: $(call src,asapconv.c asap.[ch])
-	$(CC)
+	$(COMPLINK)
 CLEAN += asapconv
 
 install-asapconv: asapconv
@@ -54,20 +61,20 @@
 
 # lib
 
-lib: libasap.a
+lib: libasap.la
 .PHONY: lib
 
-libasap.a: asap.o
-	$(AR)
-CLEAN += libasap.a
-
-asap.o: $(call src,asap.[ch])
-	$(CC) -c
-CLEAN += asap.o
+libasap.la: asap.lo
+	$(LIBLINK)
+CLEAN += libasap.la
+
+asap.lo: $(call src,asap.[ch])
+	$(LTCOMPILE)
+CLEAN += asap.lo
 
-install-lib: libasap.a $(srcdir)asap.h
+install-lib: libasap.la $(srcdir)asap.h
 	$(call INSTALL_DATA,$(srcdir)asap.h,$(prefix)/include)
-	$(call INSTALL_DATA,libasap.a,$(prefix)/lib)
+	$(call LTINSTALL,libasap.la,$(libdir))
 .PHONY: install-lib
 
 uninstall-lib:
@@ -77,7 +84,7 @@
 # SDL
 
 asap-sdl: $(call src,asap-sdl.c asap.[ch])
-	$(CC) $(SDL_CFLAGS) $(SDL_LIBS)
+	$(COMPLINK) $(SDL_CFLAGS) $(SDL_LIBS)
 CLEAN += asap-sdl
 
 install-sdl: asap-sdl
@@ -91,7 +98,7 @@
 # asapscan
 
 asapscan: $(srcdir)asapscan.c asap-asapscan.h
-	$(CC)
+	$(COMPLINK)
 CLEAN += asapscan asapscan.exe
 
 asap-asapscan.h: $(call src,asap.ci asap6502.ci asapinfo.ci cpu6502.ci pokey.ci) $(ASM6502_PLAYERS_OBX) | asap-asapscan.c