diff --git a/NPLib/Makefile b/NPLib/Makefile index 23100c20ecae03744131601dac8f4a59b2fdb23e..fe5f1a49a7a562e29f18faabe9d95f9019063956 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 4b970838d4d29becd39e07c0fae66432e5583f39..0b6f47b43672f315bd6b483c8dd49eed29051844 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