Skip to content
Snippets Groups Projects
Commit 7cfde71f authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Enable make -C src/lib dirslinks without configuring

parent f781ed6e
No related branches found
No related tags found
No related merge requests found
......@@ -74,10 +74,6 @@ dirs:
@echo "*** Compiling all directories ***"
$(MAKE) $(DIRS)
dirslinks:
@echo "*** Updating links to used modules in all directories ***"
$(MAKE) $(DIRSLINKS)
install:
cd ../config ; $(MAKE)
......@@ -149,9 +145,6 @@ uninstall:
$(DIRS):
$(MAKE) -C $@ obj
$(DIRSLINKS): %.links:
$(MAKE) -C $* links
.PHONY: lib lib-static lib-shared
lib: lib-static lib-shared
......@@ -246,14 +239,21 @@ error:
@echo First run ./configure in the root directory
endif
# this target is available anyway
# these targets are available anyway
.PHONY: clean
.PHONY: clean dirslinks
clean:
rm -f $(CLEANLIST)
rm -f $(PLUMED_MAIN_STATIC) $(PLUMED_MAIN_SHARED) $(PLUMED_MAIN_RUNTIME)
rm -f Plumed.inc* plumed-* Plumed.cmake*
dirslinks:
@echo "*** Updating links to used modules in all directories ***"
$(MAKE) $(DIRSLINKS)
$(DIRSLINKS): %.links:
$(MAKE) -C $* links
# generic makefile rules
include ../maketools/make.rules
......
......@@ -19,7 +19,7 @@ OBJ=$(SRC:.cpp=.o)
# dependency files for all c++ sources
DEP=$(addprefix deps/,$(SRC:.cpp=.d))
.PHONY: all links dirslinks obj lib install
.PHONY: all dirslinks obj lib install
# default target:
# update all links then build this module
......@@ -29,10 +29,6 @@ all: dirslinks
@echo "*** Compile local objects ***"
$(MAKE) obj
# build links for this module
links: Makefile
@echo Verify modules and create links in $(CURDIR)
@for dir in $(USE) ; do ../maketools/check_module.sh $$dir ; ../maketools/makelinks.sh $$dir ; done
# build links for all modules
dirslinks:
......@@ -62,13 +58,18 @@ endif
# this target is available anyway
.PHONY: clean
.PHONY: clean links
clean:
@echo Clean $(CURDIR)
../maketools/cleanlinks.sh
rm -fr deps links
rm -f $(CLEANLIST)
# build links for this module
links: Makefile
@echo Verify modules and create links in $(CURDIR)
@for dir in $(USE) ; do ../maketools/check_module.sh $$dir ; ../maketools/makelinks.sh $$dir ; done
# generic makefile rules
include ../maketools/make.rules
......@@ -28,8 +28,6 @@ all: $(OBJ_WRAPPER) $(OBJ_DYNAMIC_WRAPPER)
obj: all
links:
@echo Nothing to do in $(CURDIR)
# there is a single C file here, and this is its dependency:
Plumed.o: Plumed.c Plumed.h
......@@ -48,10 +46,12 @@ endif
# this target is available anyway
.PHONY: clean
.PHONY: clean links
clean:
rm -fr deps
rm -fr $(CLEANLIST)
links:
@echo Nothing to do in $(CURDIR)
# generic makefile rules
include ../maketools/make.rules
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment