Skip to content

Clear up user directories in Makefiles #901

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

Merged
rieder merged 1 commit into from
Nov 18, 2022
Merged

Clear up user directories in Makefiles #901

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
5 changes: 2 additions & 3 deletions src/amuse/community/adaptb/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ ifeq ($(origin AMUSE_DIR), undefined)
endif
-include ${AMUSE_DIR}/config.mk

GMP_LIBS ?= -L/home/boekholt/Packages/ -lgmp
MPFR_LIBS ?= -L/home/boekholt/Packages/ -lmpfr
MPFR_FLAGS ?= -I/home/boekholt/Packages/
GMP_LIBS ?= -lgmp
MPFR_LIBS ?= -lmpfr
LIBS += $(MPFR_LIBS) $(GMP_LIBS)

MPICXX ?= mpicxx
Expand Down
5 changes: 2 additions & 3 deletions src/amuse/community/adaptb/src/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ CXXFLAGS ?= -Wall -g -O2
CXXFLAGS += -std=c++11
CFLAGS ?= -Wall -g -O2

GMP_LIBS ?= -L/home/boekholt/Packages/ -lgmp
MPFR_LIBS ?= -L/home/boekholt/Packages/ -lmpfr
MPFR_FLAGS ?= -I/home/boekholt/Packages/
GMP_LIBS ?= -lgmp
MPFR_LIBS ?= -lmpfr
LIBS = $(MPFR_LIBS) $(GMP_LIBS)

###################################################################
Expand Down
5 changes: 2 additions & 3 deletions src/amuse/community/capreole/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ MPILIBS=$(MPI_BUILDDIR)/libcapreole_mpi.a

GLOBJECTS=$(SRC)/fthread.o $(SRC)/viewer.o $(SRC)/libpt.a

GLINCLUDE = -I/usr/include/GL -I/home/inti/libraries/f90gl-1.2.11/include/GL/
GLINCLUDE = -I/usr/include/GL

GLLIB = -L/home/inti/libraries/f90gl-1.2.11/lib \
-lf90GLU -lf90GL -lf90glut -lGLU -lGL -lglut
GLLIB = -lf90GLU -lf90GL -lf90glut -lGLU -lGL -lglut

X11LIB = -L/usr/X11R6/lib64 -lXaw -lXt -lXmu -lXi -lXext -lX11

Expand Down
2 changes: 0 additions & 2 deletions src/amuse/community/simplex/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ GLOBJS = $(OBJDIR)/amuse_interface_gl.o
HEALPIX_PATH = $(PLUGINS)/HEALPix/
QHULL_PATH = $(PLUGINS)/qhull-2012.1/

HDF5_PATH = /Users/jppaarde/sw/hdf5-1.6.10/installed
HDF5_FLAGS ?= -I$(HDF5_PATH)/include
HDF5_LIBS ?= -L$(HDF5_PATH)/lib -lhdf5 -lz

Expand All @@ -39,7 +38,6 @@ LIBS = $(HDF5_LIBS) \
-L$(QHULL_PATH)/lib -lqhullstatic \
-L$(HEALPIX_PATH)/lib -lhealpix_cxx

GL_PATH ?= /home/inti/libraries/f90gl-1.2.11
GLINCLUDE = -I/usr/include/GL -I$(GL_PATH)/include/GL/
GLLIB = -L$(GL_PATH)/lib -lf90GLU -lf90GL -lf90glut -lGLU -lGL -lglut #-lguide
GLLIBS= $(GLLIB) -lGL -lGLU -L/home/inti/libraries/freeglut-2.4.0/src/.libs -lglut \
Expand Down