float-store bugfix (unstatisfying!) + slightly new design of sic.c

[physik/posic.git] / Makefile

diff --git a/Makefile b/Makefile
index 70fcb8b..83a14b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,35 @@
-CC=gcc-3.4
-#CC=gcc
-CFLAGS=-Wall
-CFLAGS+=-O3
-CFLAGS+=-ffloat-store
-CFLAGS+=-g
-#CFLAGS+=-DDEBUG
-#CFLAGS+=-DVDEBUG
-LDFLAGS=-lm
+CC = gcc
 
-SOURCE=moldyn.c visual/visual.c random/random.c list/list.c
+CFLAGS = -Wall
+#CFLAGS += -Wextra -pedantic
+CFLAGS += -O3
+CFLAGS += -g
+#CFLAGS += -ffloat-store
 
-POT_SRC=potentials/tersoff.c
-#POT_SRC=potentials/tersoff_orig.c
-POT_SRC+= potentials/lennard_jones.c potentials/harmonic_oscillator.c
+CFLAGS += -DALBE
+#CFLAGS += -DSTATIC_LISTS
+#CFLAGS += -DDEBUG
+CFLAGS += -DDSTART=400 -DDEND=600
+#CFLAGS += -DVDEBUG
+#CFLAGS += -DTERSOFF_ORIG
 
-all: sic
+LDFLAGS = -lm
+#LDFLAGS += -lefence
 
-sic: 
-       $(CC) $(CFLAGS) $(LDFLAGS) $(POT_SRC) $(SOURCE) sic.c -o sic
+DEPS = moldyn.o random/random.o list/list.o
+DEPS += potentials/lennard_jones.o potentials/harmonic_oscillator.o
+DEPS += potentials/tersoff.o potentials/albe.o
+
+all: posic sic fluctuation_calc postproc pair_correlation_calc
+
+posic: $(DEPS)
+
+sic: $(DEPS) config.h
+
+postproc: $(DEPS)
+
+pair_correlation_calc: $(DEPS)
 
 .PHONY:clean
 clean:
-       rm -f sic
+       rm -vf sic postproc fluctuation_calc pair_correlation_calc *.o */*.o