diff --git a/Makefile b/Makefile index 69d4f2635658bf3a737ede2f1bc9bb38085c8b1b..780f5f99f049ccef4e686281c88b68b015360e69 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -include Makefile.conf -SRCDIRS = src extensions test +SRCDIRS = src test SUBDIRS = $(SRCDIRS) user-doc developer-doc regtest SUBDIRSCLEAN=$(addsuffix .clean,$(SUBDIRS)) diff --git a/extensions/DoNothing.cpp b/extensions/DoNothing.cpp deleted file mode 100644 index 4e01f31496584ff7923ec22c7c68907d54d52b60..0000000000000000000000000000000000000000 --- a/extensions/DoNothing.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "../src/core/ActionRegister.h" -#include "../src/core/ActionSetup.h" - -using namespace std; - -namespace PLMD{ - -/// Action which does nothing -/// -/// It is here to test linking of external libraries -class DoNothing: - public ActionSetup -{ -public: - DoNothing(const ActionOptions&ao); -}; - -PLUMED_REGISTER_ACTION(DoNothing,"DONOTHING") - -DoNothing::DoNothing(const ActionOptions&ao): -Action(ao), -ActionSetup(ao) -{ -} - -} - diff --git a/extensions/Makefile b/extensions/Makefile deleted file mode 100644 index b9ef0b84e828a284c8875ca62e2208ed45c68186..0000000000000000000000000000000000000000 --- a/extensions/Makefile +++ /dev/null @@ -1,55 +0,0 @@ - --include ../Makefile.conf - -SRC=$(wildcard *.cpp) - -OBJ=$(SRC:.cpp=.o) -SOBJ=$(SRC:.cpp=.$(SOEXT)) - -.PHONY: all clean - -ifdef GCCDEP -all: libplumedExtensions.$(SOEXT) $(SOBJ) -else -all: - @echo No configuration available - @echo First run ./configure.sh in the root directory -endif - - -libplumedExtensions.$(SOEXT): $(OBJ) - $(LDSO) -o $@ $^ - -clean: - rm -f *.o - rm -f *.d - rm -f *~ - rm -f *.tmp - rm -f *.so - rm -f *.dylib - -%.$(SOEXT) : %.o - $(LDSO) -o $@ $^ - -# this compiler is used for dependencies generation -# if unset, use normal CXX -ifndef CXXDEP -CXXDEP=$(CXX) -endif - -%.o: %.cpp - $(CXXDEP) -c -MM -MF$*.d $(CPPFLAGS) $(CXXFLAGS) $*.cpp - @cp -f $*.d $*.d.tmp - @sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | \ - sed -e 's/^ *//' -e 's/$$/:/' >> $*.d - @rm -f $*.d.tmp -ifndef XLF - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $*.cpp -o $*.o -endif - -# Individual dependencies - -ifneq ($(MAKECMDGOALS),clean) --include $(ALL_SRC_DEP) -endif -