summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2024-05-20 15:14:03 +0200
committerAlbrecht Schlosser <albrechts.fltk@online.de>2024-05-20 15:14:57 +0200
commitf903cf80261b9463a3afd72ab26b892003cb68a7 (patch)
tree8ad728e589d3ab49f2595dc552459e23c8d142ce /src
parent3d6bcda15736d32815e46d4a44d9a72fe299c5c9 (diff)
Fix "Support building with unusual prefix" (STR 3434)
Add '$(LDFLAGS)' to build commands for libs, for details see STR 3434. This applies to configure/make only, CMake builds are not affected.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Makefile b/src/Makefile
index 9fc209013..8bc50e809 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -458,7 +458,7 @@ $(LIBNAME): $(OBJECTS)
libfltk.so.$(FL_DSO_VERSION): $(OBJECTS)
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) $(CAIROLIBS)
+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(CAIROLIBS)
$(RM) libfltk.so
$(LN) libfltk.so.$(FL_DSO_VERSION) libfltk.so
@@ -474,7 +474,7 @@ libfltk.$(FL_DSO_VERSION).dylib: $(OBJECTS)
-install_name $(libdir)/$@ \
-current_version $(FL_VERSION) \
-compatibility_version $(FL_DSO_VERSION).0 \
- $(OBJECTS) $(LDLIBS) $(CAIROLIBS)
+ $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(CAIROLIBS)
$(RM) libfltk.dylib
$(LN) libfltk.$(FL_DSO_VERSION).dylib libfltk.dylib
@@ -494,7 +494,7 @@ $(FLLIBNAME): $(FLOBJECTS)
libfltk_forms.so.$(FL_DSO_VERSION): $(FLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS)
+ $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDFLAGS) $(LDLIBS)
$(RM) libfltk_forms.so
$(LN) libfltk_forms.so.$(FL_DSO_VERSION) libfltk_forms.so
@@ -510,7 +510,7 @@ libfltk_forms.$(FL_DSO_VERSION).dylib: $(FLOBJECTS) libfltk.$(FL_DSO_VERSION).dy
-install_name $(libdir)/$@ \
-current_version $(FL_VERSION) \
-compatibility_version $(FL_ABI_VERSION) \
- $(FLOBJECTS) -L. $(LDLIBS) -lfltk
+ $(FLOBJECTS) -L. $(LDFLAGS) $(LDLIBS) -lfltk
$(RM) libfltk_forms.dylib
$(LN) libfltk_forms.$(FL_DSO_VERSION).dylib libfltk_forms.dylib
@@ -530,7 +530,7 @@ $(GLLIBNAME): $(GLOBJECTS)
libfltk_gl.so.$(FL_DSO_VERSION): $(GLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(LDLIBS) $(GLDLIBS)
+ $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(LDFLAGS) $(LDLIBS) $(GLDLIBS)
$(RM) libfltk_gl.so
$(LN) libfltk_gl.so.$(FL_DSO_VERSION) libfltk_gl.so
@@ -566,7 +566,7 @@ $(IMGLIBNAME): $(IMGOBJECTS)
libfltk_images.so.$(FL_DSO_VERSION): $(IMGOBJECTS) libfltk.so.$(FL_DSO_VERSION)
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDLIBS)
+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDFLAGS) $(LDLIBS)
$(RM) libfltk_images.so
$(LN) libfltk_images.so.$(FL_DSO_VERSION) libfltk_images.so
@@ -582,7 +582,7 @@ libfltk_images.$(FL_DSO_VERSION).dylib: $(IMGOBJECTS) libfltk.$(FL_DSO_VERSION).
-install_name $(libdir)/$@ \
-current_version $(FL_VERSION) \
-compatibility_version $(FL_ABI_VERSION) \
- $(IMGOBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk
+ $(IMGOBJECTS) -L. $(LDFLAGS) $(LDLIBS) $(IMAGELIBS) -lfltk
$(RM) libfltk_images.dylib
$(LN) libfltk_images.$(FL_DSO_VERSION).dylib libfltk_images.dylib