Makefile enhancement

Makefile

@@ -19,44 +19,25 @@ PYTHON_CONFIG=$(PYTHON)-config
 PYTHON_CFLAGS=`$(PYTHON_CONFIG) --includes` `$(PYTHON_CONFIG) --cflags`
 PYTHON_LDFLAGS=-shared  -fPIC `$(PYTHON_CONFIG) --libs` `$(PYTHON_CONFIG) --ldflags|cut -d' ' -f1,2`
 
-all: .deps pyrpn.so
-
-pyrpn.so: python_pyrpn.o python_rpnexpr.o python_if.o python_const.o rpn_lib.o rpn_jit.o rpn_parse.o rpn_mutation.o rpn_if.o rpn_if_default.o rpn_ifs.o
-	$(LD) $(LDFLAGS) $(PYTHON_LDFLAGS) -o $@ $^
-
-python_pyrpn.o: python_pyrpn.c python_rpnexpr.h python_rpnexpr.o rpn_jit.o
-	$(CC) $(PYTHON_CFLAGS) $(CFLAGS) -c $<
-
-python_rpnexpr.o: python_rpnexpr.c python_rpnexpr.h rpn_jit.o
-	$(CC) $(PYTHON_CFLAGS) $(CFLAGS) -c $<
-
-python_if.o: python_if.c python_if.h
-	$(CC) $(PYTHON_CFLAGS) $(CFLAGS) -c $<
-
-python_const.o: python_const.c python_const.h
-	$(CC) $(PYTHON_CFLAGS) $(CFLAGS) -c $<
+C_SOURCES=$(wildcard *.c)
+C_OBJS=$(patsubst %.c,%.o,$(C_SOURCES))
+HEADERS=$(wildcard *.h)
+ASM_SOURCES=$(wildcard *.asm)
+ASM_OBJS=$(patsubst %.asm,%.o,$(ASM_SOURCES))
+OBJS=$(ASM_OBJS) $(C_OBJS)
+LIB=pyrpn.so
 
-rpn_jit.o: rpn_jit.c rpn_jit.h rpn_parse.o rpn_lib.o
-	$(CC) $(CFLAGS) -c $<
-
-rpn_parse.o: rpn_parse.c rpn_parse.h rpn_lib.o
-	$(CC) $(CFLAGS) -c $<
-
-rpn_mutation.o: rpn_mutation.c rpn_mutation.h rpn_parse.o
-	$(CC) $(CFLAGS) -c $<
-
-rpn_if.o: rpn_if.c rpn_if.h rpn_jit.o
-	$(CC) $(CFLAGS) -c $<
-
-rpn_if_default.o: rpn_if_default.c rpn_if_default.h rpn_if.o
-	$(CC) $(CFLAGS) -c $<
+all: .deps pyrpn.so
 
-rpn_ifs.o: rpn_ifs.c rpn_ifs.h rpn_if.o
-	$(CC) $(CFLAGS) -c $<
+$(C_OBJS): %.o: %.c $(HEADERS)
+	$(CC) $(PYTHON_CFLAGS) $(CFLAGS) -c -o $@ $<
 
-rpn_lib.o: rpn_lib.asm rpn_lib.h
+$(ASM_OBJS): %.o: %.asm $(HEADERS)
 	$(NASM) $(NASMCFLAGS) -o $@ $<
 
+$(LIB): $(OBJS)
+	$(LD) $(LDFLAGS) $(PYTHON_LDFLAGS) -o $@ $^
+
 # Doxygen documentation
 doc: doc/.doxygen.stamp
 
@@ -77,17 +58,17 @@ doc/.doxygen.stamp: $(wildcard *.c) $(wildcard *.h) Doxyfile
 
 checks: runtest unittest benchmark
 
-benchmark: pyrpn.so
+benchmark: $(LIB)
 	PYTHONPATH=`pwd` $(PYTHON) tests/benchmark.py 0x200 0x3000
 
-unittest: pyrpn.so
+unittest: $(LIB)
 	PYTHONPATH=`pwd` $(PYTHON) -m unittest -v
 
 runtest:
 	make -C tests
 
 clean:
-	-rm -fv *.o pyrpn.so test;\
+	-rm -fv $(OBJS) $(LIB) test;\
 	rm -fRv doc/.doxygen.stamp doc/* Doxyfile;\
 	make -C tests clean