From 57a5c55ca3e442fe1660d275de3b8e91c2f2182e Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Thu, 30 Dec 2010 02:56:56 +0100
Subject: [PATCH] update makefile

---
 Makefile          | 34 ++++++++++++++--------------------
 qb/config.libs.sh |  1 +
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index 7d009c6cc2..7777d418d6 100644
--- a/Makefile
+++ b/Makefile
@@ -2,60 +2,54 @@ include config.mk
 
 TARGET = ssnes
 
-DEFINES =
 OBJ = ssnes.o file.o driver.o conf/config_file.o settings.o
-libsnes = -lsnes
 
 LIBS = -lsamplerate $(libsnes)
 
-ifeq ($(BUILD_RSOUND), 1)
+ifeq ($(HAVE_RSOUND), 1)
    OBJ += audio/rsound.o
    LIBS += -lrsound
-   DEFINES += -DHAVE_RSOUND
 endif
-ifeq ($(BUILD_OSS), 1)
+ifeq ($(HAVE_OSS), 1)
    OBJ += audio/oss.o
-   DEFINES += -DHAVE_OSS
 endif
-ifeq ($(BUILD_ALSA), 1)
+ifeq ($(HAVE_ALSA), 1)
    OBJ += audio/alsa.o
    LIBS += -lasound
-   DEFINES += -DHAVE_ALSA
 endif
-ifeq ($(BUILD_ROAR), 1)
+ifeq ($(HAVE_ROAR), 1)
    OBJ += audio/roar.o
    LIBS += -lroar
-   DEFINES += -DHAVE_ROAR
 endif
-ifeq ($(BUILD_AL), 1)
+ifeq ($(HAVE_AL), 1)
    OBJ += audio/openal.o
    LIBS += -lopenal
-   DEFINES += -DHAVE_AL
 endif
 
-ifeq ($(BUILD_OPENGL), 1)
+ifeq ($(HAVE_OPENGL), 1)
    OBJ += gfx/gl.o
    LIBS += -lglfw
-   DEFINES += -DHAVE_GL
 endif
 
-ifeq ($(BUILD_CG), 1)
+ifeq ($(HAVE_CG), 1)
    LIBS += -lCg -lCgGL
-   DEFINES += -DHAVE_CG 
 endif
 
-ifeq ($(BUILD_FILTER), 1)
+ifeq ($(HAVE_FILTER), 1)
    OBJ += hqflt/hq.o
    OBJ += hqflt/grayscale.o
    OBJ += hqflt/bleed.o
    OBJ += hqflt/ntsc.o
    OBJ += hqflt/snes_ntsc/snes_ntsc.o
-   DEFINES += -DHAVE_FILTER
 endif
 
-CFLAGS = -Wall -O3 -std=gnu99 -I. $(DEFINES)
+CFLAGS = -Wall -O3 -std=gnu99 -I.
 
-all: $(TARGET) 
+all: $(TARGET) config.mk
+
+config.mk: configure qb/*
+	@echo "config.mk is outdated or non-existing. Run ./configure again."
+	exit 1
 
 ssnes: $(OBJ)
 	$(CXX) -o $@ $(OBJ) $(LIBS) $(CFLAGS)
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 16de364dbc..5277aee880 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -5,6 +5,7 @@ check_critical C99 "Cannot find C99 compatible compiler."
 
 check_lib_cxx SNES $LIBSNES snes_init -ldl
 check_critical SNES "Cannot find libsnes."
+add_define_make libsnes $LIBSNES
 
 check_lib ALSA -lasound snd_pcm_open
 check_header OSS sys/soundcard.h