Skip to content

fix Makefile for custom PREFIX support #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yingxingcheng wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix Makefile for custom PREFIX support #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
optados/od2od
optados/optados.x
optados/documents/*.aux
optados/documents/*.bbl
optados/documents/*.blg
optados/documents/*.dvi
optados/documents/*.log
optados/documents/*.out
optados/documents/*.pdf
optados/documents/*.ps
optados/documents/*.toc
optados/src/build.f90
4 changes: 2 additions & 2 deletions optados/documents/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ all:
ps2pdf $(MANUAL_NAME).ps

clean:
rm -f *.toc *.aux *.dvi *.log
rm -f *.toc *.aux *.dvi *.log *.bbl *.blg *.out *.ps

veryclean:
veryclean:
rm -f *.pdf
4 changes: 2 additions & 2 deletions optados/python/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ F90_FILES=../src/algorithms.f90 ../src/cell.f90 ../src/comms.F90 ../src/constant
KIND_MAP= kind_map

python:
f90wrap -vvvvv -m $(MODULE_NAME) $(F90_FILES) -k $(KIND_MAP)
f90wrap -vvvvv -m $(MODULE_NAME) $(F90_FILES) -k $(KIND_MAP)
f2py -c -m _OptaPyDOS -I"../src" ../src/*.o f90wrap*.f90

# Utility targets
Expand All @@ -15,4 +15,4 @@ clean:
rm -f f90wrap*

veryclean: clean
rm -f OptaPyDOS.py _OptaPyDOS.so
rm -f _OptaPyDOS.so
17 changes: 13 additions & 4 deletions optados/src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ projection_utils.o : projection_utils.f90 cell.o comms.o constants.o cell.o elec
xmgrace_utils.o : xmgrace_utils.f90 io.o constants.o ../make.system
$(F90) -c $(FFLAGS) $<

build.f90 :
build.f90 :
./make_build_info.sh

build.o : build.f90 ../make.system
Expand All @@ -104,11 +104,20 @@ build.o : build.f90 ../make.system


clean:
rm -f *.o *.mod *.MOD build_info.f90
rm -f *.o *.mod *.MOD build_info.f90 build.f90


veryclean: clean
rm -f optados$(EXTENSION) optados$(EXTENSION).debug optados$(EXTENSION).mpi ../od2od ../optados.x
rm -f optados$(EXTENSION) optados$(EXTENSION).debug optados$(EXTENSION).mpi ../od2od ../optados$(EXTENSION)

install:
cp optados$(EXTENSION) $(INSTALL_DIR)
@if [ ! "$(abspath ../optados$(EXTENSION))" = "$(abspath $(PREFIX)/optados$(EXTENSION))" ]; then \
cp ../optados$(EXTENSION) $(PREFIX)/optados$(EXTENSION); \
else \
echo "Skipping copy optados$(EXTENSION): source and destination are the same"; \
fi
@if [ ! "$(abspath ../od2od)" = "$(abspath $(PREFIX)/od2od)" ]; then \
cp ../od2od $(PREFIX)/od2od; \
else \
echo "Skipping copy od2od: source and destination are the same"; \
fi