Skip to content

Yet more glpk-related extras/Makefile fixes #621

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
merged 1 commit into from
Mar 21, 2012
Merged

Yet more glpk-related extras/Makefile fixes #621

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
15 changes: 9 additions & 6 deletions extras/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ endif

GLPK_VER = 4.43
GLPK_CONST = 0x[0-9a-fA-F]+|[-+]?\s*[0-9]+
GLPK_PREFIX = /usr/

default: install
compile: $(addprefix compile-, $(LIBS)) glpk_h.jl
Expand All @@ -34,11 +33,9 @@ distclean: $(addprefix distclean-, $(LIBS))
## GLPK ##

ifeq ($(USE_SYSTEM_GLPK), 1)
GLPK_INC = -I /usr/include/
GLPK_LIB =
GLPK_PREFIX = /usr/
else
GLPK_INC = -I glpk-$(GLPK_VER)/include/
GLPK_LIB =
GLPK_PREFIX = glpk-$(GLPK_VER)/
endif

GLPK_OBJ_TARGET = $(EXTROOTLIB)/libglpk.$(SHLIB_EXT)
Expand Down Expand Up @@ -72,8 +69,14 @@ distclean-glpk: clean-glpk

## GLPK Wrapper

GLPKW_INC = -I glpk-$(GLPK_VER)/
ifeq ($(USE_SYSTEM_GLPK), 1)
GLPKW_INC = -I /usr/include/
GLPKW_LIB = -lglpk
else
GLPKW_INC = -I glpk-$(GLPK_VER)/include/
GLPKW_LIB = -L$(EXTROOTLIB)/ -lglpk
endif


$(EXTROOTLIB)/libglpk_wrapper.$(SHLIB_EXT): glpk_wrapper.c $(GLPK_OBJ_TARGET)
$(CC) -O2 -shared -fPIC $(GLPKW_INC) glpk_wrapper.c $(GLPKW_LIB) -o $(EXTROOTLIB)/libglpk_wrapper.$(SHLIB_EXT) -Wl,-rpath,$(EXTROOTLIB)
Expand Down