--- Makefile.orig	2007-12-21 11:39:41.000000000 +0100
+++ Makefile	2009-03-21 11:51:26.000000000 +0100
@@ -8,17 +8,16 @@
 INCLUDE = -Ilibopenjpeg
 
 # General configuration variables:
-CC = gcc
-AR = ar
 
-PREFIX = /usr
 INSTALL_LIBDIR = $(PREFIX)/lib
 INSTALL_INCLUDE = $(PREFIX)/include
 
+SUBDIRS=	jpwl mj2
+
 # Converts cr/lf to just lf
 DOS2UNIX = dos2unix
 
-COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC
+COMPILERFLAGS := $(CFLAGS) -Wall -std=c99 -fPIC
 LIBRARIES = -lstdc++
 
 MODULES = $(SRCS:.c=.o)
@@ -33,7 +32,13 @@
 
 default: all
 
-all: OpenJPEG
+all: OpenJPEG subdirs
+
+subdirs:
+	set -e; \
+	for dir in $(SUBDIRS); do \
+		$(MAKE) -C $$dir; \
+	done
 
 dist: OpenJPEG
 	install -d dist