60 lines
2.3 KiB
Diff
60 lines
2.3 KiB
Diff
diff --git a/Bindings/Java/Makefile.in b/Bindings/Java/Makefile.in
|
|
index b0a6e1c..5982742 100644
|
|
--- a/Bindings/Java/Makefile.in
|
|
+++ b/Bindings/Java/Makefile.in
|
|
@@ -52,7 +52,7 @@ JAVA_JNI_FILE = $(LIB_PFX)$(API_NAME)_java.$(LIB_EXT)
|
|
jni: $(JAVA_JNI_FILE)
|
|
|
|
$(JAVA_JNI_FILE): bindings.$O $(API_NAME)
|
|
- $(MKLIB:<name>=$(API_NAME)) $@ bindings.$O $(API_LDFLAGS)
|
|
+ $(MKLIB:<name>=$(API_NAME)) $@ bindings.$O $(API_LDFLAGS) $(LDFLAGS)
|
|
|
|
bindings.$O:
|
|
$(CC) $(LIBCFLAGS) $(JAVA_JNI_FLAGS) -o $@ -c $(SRC_DIR)/bindings.c
|
|
diff --git a/Bindings/OCaml/Makefile.in b/Bindings/OCaml/Makefile.in
|
|
index 47f7201..469f41e 100644
|
|
--- a/Bindings/OCaml/Makefile.in
|
|
+++ b/Bindings/OCaml/Makefile.in
|
|
@@ -55,13 +55,13 @@ OCAML_FILES = $(OCAML_MISC) $(OCAML_CLIBS) $(OCAML_BCLIB) $(OCAML_NCLIB)
|
|
all : $(OCAML_FILES)
|
|
|
|
$(OCAML_CLIBS) : brlapi_stubs.$O brlapi
|
|
- $(OCAMLMKLIB) $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
|
|
+ $(OCAMLMKLIB) -ldopt "$(LDFLAGS)" $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
|
|
|
|
$(OCAML_BCLIB) : $(OCAML_CLIBS) brlapi.cmo
|
|
$(OCAMLC) -a $(OCAMLMKLIB_FLAGS) -o $(OCAML_LIB).cma brlapi.cmo
|
|
|
|
$(OCAML_NCLIB) : $(OCAML_CLIBS) brlapi.cmx
|
|
- $(OCAMLMKLIB) $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
|
|
+ $(OCAMLMKLIB) -ldopt "$(LDFLAGS)" $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
|
|
|
|
brlapi.cmi: brlapi.mli
|
|
$(OCAMLC) -o $@ -c brlapi.mli
|
|
diff --git a/Bindings/Tcl/Makefile.in b/Bindings/Tcl/Makefile.in
|
|
index 683e74e..ceae16f 100644
|
|
--- a/Bindings/Tcl/Makefile.in
|
|
+++ b/Bindings/Tcl/Makefile.in
|
|
@@ -30,7 +30,7 @@ TCL_API = $(LIB_PFX)$(API_NAME)_tcl.$(LIB_EXT)
|
|
all: $(TCL_API)
|
|
|
|
$(TCL_API): bindings.$O $(API_NAME)
|
|
- $(MKLIB:<name>=$(API_NAME)) $@ bindings.$O $(TCL_LIBS) $(API_LDFLAGS)
|
|
+ $(MKLIB:<name>=$(API_NAME)) $@ bindings.$O $(TCL_LIBS) $(API_LDFLAGS) $(LDFLAGS)
|
|
|
|
bindings.$O:
|
|
$(CC) $(TCL_CPPFLAGS) $(LIBCFLAGS) -o $@ -c $(SRC_DIR)/bindings.c
|
|
diff --git a/Programs/Makefile.in b/Programs/Makefile.in
|
|
index 0016035..5297a8b 100644
|
|
--- a/Programs/Makefile.in
|
|
+++ b/Programs/Makefile.in
|
|
@@ -613,7 +613,7 @@ $(API_LIB_VERSIONED): $(API_LIB)
|
|
|
|
api-dynamic-library: $(API_LIB)
|
|
$(API_LIB): $(API_CLIENT_OBJECTS)
|
|
- $(MKLIB:<name>=${API_LIB_VERSIONED}) $@ $(API_CLIENT_OBJECTS) $(API_LIBRARIES)
|
|
+ $(MKLIB:<name>=${API_LIB_VERSIONED}) $@ $(API_CLIENT_OBJECTS) $(API_LIBRARIES) $(LDFLAGS)
|
|
|
|
api-dynamic-library-windows: $(API_DLL)
|
|
$(API_DLL): $(API_CLIENT_OBJECTS)
|