Merge branch 'leadoff'

[physik/posic.git] / Makefile

diff --git a/Makefile b/Makefile
index 224fe72..fa40909 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,37 @@
 CC = gcc-4.3
+#CC = gcc-3.4
 
 CFLAGS = -Wall -Winline
 #CFLAGS += -Wextra -pedantic
+
 CFLAGS += -O3 -march=native -msse2 -mfpmath=sse
+#CFLAGS += -O3 -march=athlon64
+
 CFLAGS += -g
 #CFLAGS += -pg
 #CFLAGS += -ffloat-store
 
 #CFLAGS += -DPARALLEL -fopenmp
 #CFLAGS += -DPTHREADS -lpthread
-CFLAGS += -DVISUAL_THREAD -lpthread
+#CFLAGS += -DVISUAL_THREAD -lpthread
 #CFLAGS += -DPTHREADS -DVISUAL_THREAD -lpthread
 
-CFLAGS += -DALBE
+#CFLAGS += -DALBE
 CFLAGS += -DALBE_FAST
 #CFLAGS += -DTERSOFF_ORIG
 
 #CFLAGS += -DSTATIC_LISTS
 CFLAGS += -DLOWMEM_LISTS
 
+#CFLAGS += -DPDEBUG
 #CFLAGS += -DDEBUG
-#CFLAGS += -DDSTART=-1 -DDEND=40 -DDATOM=0
+#CFLAGS += -DDSTART=50 -DDEND=60 -DDATOM=0
 #CFLAGS += -DVDEBUG
 
+#CFLAGS += -DQUENCH
+
 LDFLAGS = -lm
+
 #LDFLAGS += -lc_p
 #LDFLAGS += -lefence
 
@@ -37,9 +45,10 @@ SRC += potentials/lennard_jones.c potentials/harmonic_oscillator.c
 SRC += potentials/tersoff.c potentials/albe.c
 SRC += potentials/albe_fast.c
 
-ALL = mdrun sic fluctuation_calc postproc pair_correlation_calc diffusion_calc
+#ALL = mdrun sic fluctuation_calc postproc pair_correlation_calc diffusion_calc
+ALL = mdrun fluctuation_calc postproc pair_correlation_calc diffusion_calc
 ALL += diffusion_calc_ver2 bond_analyze search_bonds visual_atoms
-ALL += display_atom_data atom_match
+ALL += display_atom_data atom_match msd_calc s2xyz
 
 all: $(ALL)
 
@@ -67,6 +76,10 @@ display_atom_data: $(DEPS)
 
 atom_match: $(DEPS)
 
+msd_calc: $(DEPS)
+
+s2xyz: $(DEPS)
+
 .PHONY:clean
 clean:
        rm -vf $(ALL) *.o */*.o