--- fbzx-2.4.1/Makefile~	2010-06-17 12:19:32.602296244 +0200
+++ fbzx-2.4.1/Makefile	2010-06-17 12:18:48.572309216 +0200
@@ -1,9 +1,8 @@
 CC = gcc -O2 -Wall -Wno-pointer-sign `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
-CCo = gcc `pkg-config --libs sdl libpulse-simple alsa`
 
 fbzx: computer.o Z80free.o Z80free_codes.o Z80free_codesCB.o Z80free_codesED.o Z80free_codesDD.o Z80free_codesFD.o Z80free_codesDDCB.o Z80free_codesFDCB.o emulator.o cargador.o characters.o menus.o sound.o tape.o spk_ay.o microdrive.o
 
-	$(CCo) -o fbzx computer.o Z80free.o Z80free_codes.o Z80free_codesCB.o Z80free_codesED.o Z80free_codesDD.o Z80free_codesFD.o Z80free_codesDDCB.o Z80free_codesFDCB.o emulator.o cargador.o characters.o menus.o sound.o tape.o spk_ay.o microdrive.o
+	$(CC) $(LDFLAGS) -o fbzx computer.o Z80free.o Z80free_codes.o Z80free_codesCB.o Z80free_codesED.o Z80free_codesDD.o Z80free_codesFD.o Z80free_codesDDCB.o Z80free_codesFDCB.o emulator.o cargador.o characters.o menus.o sound.o tape.o spk_ay.o microdrive.o $(LIBS)
 
 clean:
 	rm fbzx *.o *~
@@ -31,53 +30,53 @@
 	rm -rf /usr/local/share/spectrum-roms
 
 spk_ay.o: spk_ay.c spk_ay.h emulator.h sound.h computer.h z80free/Z80free.h
-	$(CC) -c -o spk_ay.o spk_ay.c
+	$(CC) $(CFLAGS) -c -o spk_ay.o spk_ay.c
 
 microdrive.o: microdrive.c microdrive.h z80free/Z80free.h computer.h emulator.h z80free/Z80free.h
-	$(CC) -c -o microdrive.o microdrive.c
+	$(CC) $(CFLAGS) -c -o microdrive.o microdrive.c
 
 sound.o: sound.c sound.h computer.h emulator.h z80free/Z80free.h
-	$(CC) -c -o sound.o sound.c
+	$(CC) $(CFLAGS) -c -o sound.o sound.c
 
 emulator.o: emulator.c z80free/Z80free.h computer.h emulator.h characters.h menus.h cargador.h sound.h tape.h microdrive.h
-	$(CC) -c -o emulator.o emulator.c
+	$(CC) $(CFLAGS) -c -o emulator.o emulator.c
 
 computer.o: computer.c z80free/Z80free.h computer.h emulator.h characters.h menus.h cargador.h sound.h tape.h spk_ay.h microdrive.h
-	$(CC) -c -o computer.o computer.c
+	$(CC) $(CFLAGS) -c -o computer.o computer.c
 
 tape.o: tape.c z80free/Z80free.h computer.h emulator.h menus.h tape.h computer.h
-	$(CC) -c -o tape.o tape.c
+	$(CC) $(CFLAGS) -c -o tape.o tape.c
 
 cargador.o: cargador.c cargador.h computer.h emulator.h z80free/Z80free.h characters.h menus.h computer.h
-	$(CC) -c -o cargador.o cargador.c
+	$(CC) $(CFLAGS) -c -o cargador.o cargador.c
 
 characters.o: characters.c characters.h emulator.h computer.h
-	$(CC) -c -o characters.o characters.c
+	$(CC) $(CFLAGS) -c -o characters.o characters.c
 
 menus.o: menus.c menus.h characters.h computer.h emulator.h z80free/Z80free.h cargador.h tape.h
-	$(CC) -c -o menus.o menus.c
+	$(CC) $(CFLAGS) -c -o menus.o menus.c
 
 Z80free.o: z80free/Z80free.c z80free/Z80free.h
-	$(CC) -c -o Z80free.o z80free/Z80free.c
+	$(CC) $(CFLAGS) -c -o Z80free.o z80free/Z80free.c
 
 Z80free_codes.o: z80free/Z80free_codes.c z80free/Z80free.h
-	$(CC) -c -o Z80free_codes.o z80free/Z80free_codes.c
+	$(CC) $(CFLAGS) -c -o Z80free_codes.o z80free/Z80free_codes.c
 	
 Z80free_codesCB.o: z80free/Z80free_codesCB.c z80free/Z80free.h
-	$(CC) -c -o Z80free_codesCB.o z80free/Z80free_codesCB.c
+	$(CC) $(CFLAGS) -c -o Z80free_codesCB.o z80free/Z80free_codesCB.c
 
 Z80free_codesED.o: z80free/Z80free_codesED.c z80free/Z80free.h
-	$(CC) -c -o Z80free_codesED.o z80free/Z80free_codesED.c
+	$(CC) $(CFLAGS) -c -o Z80free_codesED.o z80free/Z80free_codesED.c
 	
 Z80free_codesDD.o: z80free/Z80free_codesDD.c z80free/Z80free.h
-	$(CC) -c -o Z80free_codesDD.o z80free/Z80free_codesDD.c
+	$(CC) $(CFLAGS) -c -o Z80free_codesDD.o z80free/Z80free_codesDD.c
 	
 Z80free_codesFD.o: z80free/Z80free_codesFD.c z80free/Z80free.h
-	$(CC) -c -o Z80free_codesFD.o z80free/Z80free_codesFD.c
+	$(CC) $(CFLAGS) -c -o Z80free_codesFD.o z80free/Z80free_codesFD.c
 
 Z80free_codesDDCB.o: z80free/Z80free_codesDDCB.c z80free/Z80free.h
-	$(CC) -c -o Z80free_codesDDCB.o z80free/Z80free_codesDDCB.c
+	$(CC) $(CFLAGS) -c -o Z80free_codesDDCB.o z80free/Z80free_codesDDCB.c
 	
 Z80free_codesFDCB.o: z80free/Z80free_codesFDCB.c z80free/Z80free.h
-	$(CC) -c -o Z80free_codesFDCB.o z80free/Z80free_codesFDCB.c
+	$(CC) $(CFLAGS) -c -o Z80free_codesFDCB.o z80free/Z80free_codesFDCB.c