From a9ab6c6481cd3d2cca4a36acec0322fd3588a131 Mon Sep 17 00:00:00 2001 From: adrien-matta <a.matta@surrey.ac.uk> Date: Fri, 31 Jan 2014 18:12:01 +0000 Subject: [PATCH] * cosmetic change in the makefile and script --- NPLib/Makefile | 2 +- NPLib/scripts/makefile_detector.sh | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/NPLib/Makefile b/NPLib/Makefile index 23100c20e..fe5f1a49a 100644 --- a/NPLib/Makefile +++ b/NPLib/Makefile @@ -25,7 +25,7 @@ ifeq ($(findstring macosx, $(ARCH)), macosx) endif ############### liblist ############## -liblistfile: $(SHARELIB) $(FILLINC) +liblistfile: $(SHARELIB) $(FILLIB) ./scripts/buildliblist.sh ############### sharedlib ############## diff --git a/NPLib/scripts/makefile_detector.sh b/NPLib/scripts/makefile_detector.sh index 4b970838d..0b6f47b43 100755 --- a/NPLib/scripts/makefile_detector.sh +++ b/NPLib/scripts/makefile_detector.sh @@ -35,16 +35,5 @@ printf "FillIncludeDir \n" >> $2 printf "\t@echo \"Entering $1 directory...\"\n" >> $2 # execute make command with target specified on command line printf "\tmake --silent -C ./$1\n" >> $2 -# copy header files -#printf "\tcd $1; cp -f *.h ../include\n" >> $2 -# remove *Dict header files -#printf "\tcd include; rm *Dict.h\n" >> $2 -# copy library files -#printf "\tcd $1; cp -f *.so ../lib\n" >> $2 -# deal with mac osx dylib files -#echo "ifeq (\$(findstring macosx, \$(ARCH)), macosx)" >> $2 -#echo "\t@echo \"to be done\"" -#echo "endif" >> $2 -# newline printf "\n" >> $2 -- GitLab