Fixed Makefiles -- there were still references to progressbar

manodeep · Mar 30, 2016 · 657cc14 · 657cc14
1 parent 1fe20c4
commit 657cc14
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 20 deletions.
diff --git a/xi_theory/vpf/Makefile b/xi_theory/vpf/Makefile
@@ -5,7 +5,6 @@ endif
 
 target := vpf 
 SRC1   := vpf.c countspheres.c ../../utils/gridlink.c ../../utils/utils.c ../../io/ftread.c ../../io/io.c 
-OBJS1  := $(SRC1:.c=.o)
 INCL   := countspheres.h ../../io/ftread.h ../../io/io.h ../../utils/utils.h ../../utils/gridlink.h \
 		../../utils/function_precision.h ../../utils/cellarray.h ../../utils/avx_calls.h \
 		../../utils/defs.h 
@@ -14,6 +13,7 @@ ifeq ($(OUTPUT_PGBAR), 1)
 SRC1 += ../../utils/progressbar.c
 INCL += ../../utils/progressbar.h 
 endif
+OBJS1  := $(SRC1:.c=.o)
 
 all: $(target) $(SRC1) $(INCL) ../../theory.options ../../common.mk Makefile 
 
@@ -26,14 +26,17 @@ countspheres.o: countspheres.c $(INCL) ../../theory.options ../../common.mk Make
 %.o: %.c $(INCL) ../../theory.options ../../common.mk Makefile
 	$(CC) $(OPT) $(CFLAGS) $(INCLUDE) -c $< -o $@
 
-SRC2   = countspheres.c ../../utils/gridlink.c ../../utils/utils.c ../../utils/progressbar.c 
-OBJS2  = $(SRC2:.c=.o)
+SRC2 := countspheres.c ../../utils/gridlink.c ../../utils/utils.c
+ifeq ($(OUTPUT_PGBAR), 1)
+SRC2 += ../../utils/progressbar.c
+endif
+OBJS2 := $(SRC2:.c=.o)
 
 libs: lib
 lib:  libcountspheres.a | ../../lib ../../include 
 
 
-libcountspheres.a: $(OBJS2) ../../theory.options ../../common.mk Makefile | ../../lib ../../include
+libcountspheres.a: $(OBJS2) $(INCL) ../../theory.options ../../common.mk Makefile | ../../lib ../../include
 	ar rcs $@ $(OBJS2)
 	cp -p $@ ../../lib/
 	sed -e "s/DOUBLE/$(VECTOR_TYPE)/g" countspheres.h > ../../include/countspheres.h 

diff --git a/xi_theory/wp/Makefile b/xi_theory/wp/Makefile
@@ -5,7 +5,6 @@ endif
 
 target := wp
 SRC1   := wp.c countpairs_wp.c ../../utils/utils.c ../../utils/gridlink.c ../../io/io.c ../../io/ftread.c 
-OBJS1  := $(SRC1:.c=.o)
 INCL   := countpairs_wp.h ../../io/ftread.h ../../io/io.h ../../utils/utils.h ../../utils/gridlink.h \
 		../../utils/function_precision.h ../../utils/cellarray.h ../../utils/avx_calls.h \
 		../../utils/defs.h ../../utils/sglib.h  
@@ -14,6 +13,7 @@ ifeq ($(OUTPUT_PGBAR), 1)
 SRC1 += ../../utils/progressbar.c
 INCL += ../../utils/progressbar.h 
 endif
+OBJS1  := $(SRC1:.c=.o)
 
 all: $(target) $(SRC1) $(INCL) ../../theory.options ../../common.mk Makefile 
 
@@ -23,12 +23,15 @@ $(target): $(OBJS1) $(INCL) ../../theory.options ../../common.mk Makefile
 %.o: %.c $(INCL) ../../theory.options ../../common.mk Makefile
 	$(CC) $(OPT) $(CFLAGS) $(INCLUDE) -c $< -o $@
 
-OBJS2=countpairs_wp.o ../../utils/gridlink.o ../../utils/utils.o ../../utils/progressbar.o 
+OBJS2 := countpairs_wp.o ../../utils/gridlink.o ../../utils/utils.o 
+ifeq ($(OUTPUT_PGBAR), 1)
+OBJS2 += ../../utils/progressbar.o
+endif
 
 libs: lib
 lib: libcountpairs_wp.a | ../../lib ../../include
 
-libcountpairs_wp.a: $(OBJS2) ../../theory.options ../../common.mk Makefile | ../../lib ../../include
+libcountpairs_wp.a: $(OBJS2) $(INCL) ../../theory.options ../../common.mk Makefile | ../../lib ../../include
 	ar rcs $@ $(OBJS2)
 	cp -p $@ ../../lib/
 	sed -e "s/DOUBLE/$(VECTOR_TYPE)/g" countpairs_wp.h > ../../include/countpairs_wp.h

diff --git a/xi_theory/xi/Makefile b/xi_theory/xi/Makefile
@@ -5,7 +5,6 @@ endif
 
 target := xi 
 SRC1   := xi.c countpairs_xi.c ../../utils/gridlink.c ../../utils/utils.c ../../io/ftread.c ../../io/io.c 
-OBJS1  := $(SRC1:.c=.o)
 INCL   := countpairs_xi.h ../../io/ftread.h ../../io/io.h ../../utils/utils.h ../../utils/gridlink.h \
 		../../utils/function_precision.h ../../utils/cellarray.h ../../utils/avx_calls.h \
 		../../utils/defs.h 
@@ -14,7 +13,7 @@ ifeq ($(OUTPUT_PGBAR), 1)
 SRC1 += ../../utils/progressbar.c
 INCL += ../../utils/progressbar.h 
 endif
-
+OBJS1  := $(SRC1:.c=.o)
 
 all: $(target) $(SRC1) $(INCL) ../../theory.options ../../common.mk Makefile 
 
@@ -24,13 +23,16 @@ $(target): $(OBJS1) $(INCL) ../../common.mk ../../theory.options Makefile
 %.o: %.c $(INCL) ../../theory.options ../../common.mk Makefile
 	$(CC) $(OPT) $(CFLAGS) $(INCLUDE) -c $< -o $@
 
-SRC2   = countpairs_xi.c ../../utils/gridlink.c ../../utils/utils.c ../../utils/progressbar.c 
-OBJS2  = $(SRC2:.c=.o)
+SRC2  := countpairs_xi.c ../../utils/gridlink.c ../../utils/utils.c
+ifeq ($(OUTPUT_PGBAR), 1)
+SRC2 += ../../utils/progressbar.c
+endif
+OBJS2 := $(SRC2:.c=.o)
 
 libs: lib
 lib:  libcountpairs_xi.a | ../../lib ../../include 
 
-libcountpairs_xi.a: $(OBJS2) ../../common.mk ../../theory.options Makefile | ../../lib ../../include
+libcountpairs_xi.a: $(OBJS2) $(INCL) ../../common.mk ../../theory.options Makefile | ../../lib ../../include
 	ar rcs $@ $(OBJS2)
 	cp -p $@ ../../lib/
 	sed -e "s/DOUBLE/$(VECTOR_TYPE)/g" countpairs_xi.h > ../../include/countpairs_xi.h 

diff --git a/xi_theory/xi_of_r/Makefile b/xi_theory/xi_of_r/Makefile
@@ -6,7 +6,6 @@ endif
 
 target := DD 
 SRC1   := DD.c countpairs.c ../../utils/gridlink.c ../../utils/utils.c ../../io/ftread.c ../../io/io.c 
-OBJS1  := $(SRC1:.c=.o)
 INCL   := countpairs.h ../../io/ftread.h ../../io/io.h ../../utils/utils.h ../../utils/gridlink.h \
 		../../utils/function_precision.h ../../utils/cellarray.h ../../utils/avx_calls.h \
 		../../utils/defs.h 
@@ -15,7 +14,7 @@ ifeq ($(OUTPUT_PGBAR), 1)
 SRC1 += ../../utils/progressbar.c
 INCL += ../../utils/progressbar.h 
 endif
-
+OBJS1  := $(SRC1:.c=.o)
 
 all: $(target) $(SRC1) $(INCL) ../../theory.options ../../common.mk Makefile 
 
@@ -25,13 +24,17 @@ $(target): $(OBJS1) $(INCL) ../../theory.options ../../common.mk Makefile
 %.o: %.c $(INCL) ../../theory.options ../../common.mk Makefile
 	$(CC) $(OPT) $(CFLAGS) $(INCLUDE) -c $< -o $@
 
-SRC2   = countpairs.c ../../utils/gridlink.c ../../utils/utils.c ../../utils/progressbar.c 
+SRC2   = countpairs.c ../../utils/gridlink.c ../../utils/utils.c
+ifeq ($(OUTPUT_PGBAR), 1)
+SRC2 += ../../utils/progressbar.c
+endif
+
 OBJS2  = $(SRC2:.c=.o)
 
 libs: lib
 lib:  libcountpairs.a | ../../lib
 
-libcountpairs.a: $(OBJS2) ../../theory.options ../../common.mk Makefile | ../../lib ../../include
+libcountpairs.a: $(OBJS2) $(INCL) ../../theory.options ../../common.mk Makefile | ../../lib ../../include
 	ar rcs $@ $(OBJS2)
 	cp -p $@ ../../lib/
 	sed -e "s/DOUBLE/$(VECTOR_TYPE)/g" countpairs.h > ../../include/countpairs.h

diff --git a/xi_theory/xi_rp_pi/Makefile b/xi_theory/xi_rp_pi/Makefile
@@ -6,7 +6,6 @@ endif
 target:= DDrppi wprp
 
 SRC1  := DDrppi.c countpairs_rp_pi.c ../../utils/utils.c ../../utils/gridlink.c ../../io/io.c ../../io/ftread.c 
-OBJS1 := $(SRC1:.c=.o)
 INCL  := countpairs_rp_pi.h ../../io/ftread.h ../../io/io.h ../../utils/utils.h ../../utils/gridlink.h \
 		../../utils/function_precision.h ../../utils/cellarray.h ../../utils/avx_calls.h \
 		../../utils/defs.h 
@@ -15,6 +14,7 @@ ifeq ($(OUTPUT_PGBAR), 1)
 SRC1 += ../../utils/progressbar.c
 INCL += ../../utils/progressbar.h 
 endif
+OBJS1 := $(SRC1:.c=.o)
 
 all: $(target) ../../theory.options ../../common.mk Makefile 
 
@@ -24,15 +24,18 @@ DDrppi: $(OBJS1) $(INCL) ../../theory.options ../../common.mk Makefile
 %.o: %.c $(INCL) ../../theory.options ../../common.mk Makefile
 	$(CC) $(OPT) $(CFLAGS) $(INCLUDE) -c $< -o $@
 
-OBJS2= wprp.o ../../utils/utils.o 
+OBJS2 := wprp.o ../../utils/utils.o 
 wprp: $(OBJS2) ../../theory.options ../../common.mk Makefile
 	$(CC) $(CFLAGS) $(INCLUDE) -o $@ $(OBJS2) $(CLINK)
 
 libs: lib
 lib: libcountpairs_rp_pi.a | ../../lib
 
-OBJS3=countpairs_rp_pi.o ../../utils/gridlink.o ../../utils/utils.o ../../utils/progressbar.o 
-libcountpairs_rp_pi.a: $(OBJS3) ../../theory.options ../../common.mk Makefile | ../../lib ../../include
+OBJS3 := countpairs_rp_pi.o ../../utils/gridlink.o ../../utils/utils.o
+ifeq ($(OUTPUT_PGBAR), 1)
+OBJS3 += ../../utils/progressbar.o
+endif
+libcountpairs_rp_pi.a: $(OBJS3) $(INCL) ../../theory.options ../../common.mk Makefile | ../../lib ../../include
 	ar rcs $@ $(OBJS3)
 	cp -p $@ ../../lib/
 	sed -e "s/DOUBLE/$(VECTOR_TYPE)/g" countpairs_rp_pi.h > ../../include/countpairs_rp_pi.h