| 1 |
Description: Avoid useless dependency on LIBS |
| 2 |
Don't add @LIBS@ for extensions. |
| 3 |
Killing @LIBS@ is only OK for Debian. More good solution is required |
| 4 |
for upstream. |
| 5 |
Forwarded: Under discussion |
| 6 |
Author: NIIBE Yutaka <[email protected]> |
| 7 |
Last-Update: 2024-12-06 |
| 8 |
|
| 9 |
Index: gauche/ext/Makefile.ext.in |
| 10 |
=================================================================== |
| 11 |
--- gauche.orig/ext/Makefile.ext.in |
| 12 |
+++ gauche/ext/Makefile.ext.in |
| 13 |
@@ -19,7 +19,7 @@ DESTDIR = |
| 14 |
CC = @CC@ |
| 15 |
AR = @AR@ |
| 16 |
LOCAL_LFLAGS = @LOCAL_LIB@ |
| 17 |
-LIBS = $(XLIBS) @LIBS@ |
| 18 |
+LIBS = $(XLIBS) |
| 19 |
CFLAGS = @CFLAGS@ @SHLIB_SO_CFLAGS@ $(XCFLAGS) |
| 20 |
CPPFLAGS = @CPPFLAGS@ $(XCPPFLAGS) |
| 21 |
LDFLAGS = $(LOCAL_LFLAGS) $(XLDFLAGS) @SHLIB_SO_LDFLAGS@ |
| 22 |
Index: gauche/src/Makefile.in |
| 23 |
=================================================================== |
| 24 |
--- gauche.orig/src/Makefile.in |
| 25 |
+++ gauche/src/Makefile.in |
| 26 |
@@ -270,13 +270,14 @@ OBJECTS = $(libgauche_OBJECTS) $(gosh_OB |
| 27 |
@CROSS_COMPILING_no@all : $(LIBGAUCHE).$(SOEXT) $(INSTALL_BINS) test-extra$(EXEEXT) |
| 28 |
@CROSS_COMPILING_yes@all : $(LIBGAUCHE).$(SOEXT) $(INSTALL_BINS) |
| 29 |
|
| 30 |
-gosh$(EXEEXT) : $(LIBGAUCHE).$(SOEXT) $(gosh_OBJECTS) |
| 31 |
+ |
| 32 |
+gosh$(EXEEXT) : $(LIBGAUCHE).$(SOEXT) $(gosh_OBJECTS) |
| 33 |
@rm -f gosh$(EXEEXT) |
| 34 |
- $(LINK) $(gosh_LDFLAGS) -o gosh$(EXEEXT) $(gosh_OBJECTS) $(gosh_LDADD) $(LIBS) |
| 35 |
+ $(LINK) $(gosh_LDFLAGS) -o gosh$(EXEEXT) $(gosh_OBJECTS) $(gosh_LDADD) |
| 36 |
|
| 37 |
-gosh-noconsole$(EXEEXT) : $(LIBGAUCHE).$(SOEXT) $(gosh_noconsole_OBJECTS) |
| 38 |
+gosh-noconsole$(EXEEXT) : $(LIBGAUCHE).$(SOEXT) $(gosh_noconsole_OBJECTS) |
| 39 |
@rm -f gosh-noconsole$(EXEEXT) |
| 40 |
- $(LINK) $(gosh_LDFLAGS) -o gosh-noconsole$(EXEEXT) $(gosh_noconsole_OBJECTS) $(gosh_LDADD) $(LIBS) -Wl,--subsystem,windows |
| 41 |
+ $(LINK) $(gosh_LDFLAGS) -o gosh-noconsole$(EXEEXT) $(gosh_noconsole_OBJECTS) $(gosh_LDADD) -Wl,--subsystem,windows |
| 42 |
|
| 43 |
test-extra$(EXEEXT) : $(LIBGAUCHE).$(SOEXT) $(test_extra_OBJECTS) |
| 44 |
@rm -f test-extra$(EXEEXT) |
| 45 |
@@ -286,8 +287,8 @@ test-extra$(EXEEXT) : $(LIBGAUCHE).$(SOE |
| 46 |
# need to relink gosh-noconsole.exe (windows no-console version). |
| 47 |
relink : |
| 48 |
$(RELINK) $(libgauche_LDFLAGS) $(LIBGAUCHE).$(SOEXT) $(libgauche_OBJECTS) $(libgc_pic_LIBRARY) $(ATOMIC_OPS_LIBS) $(LIBS) |
| 49 |
- $(RELINK) $(gosh_LDFLAGS) -o gosh$(EXEEXT) $(gosh_OBJECTS) $(gosh_LDADD) $(LIBS) |
| 50 |
- $(RELINK) -o gauche-config$(EXEEXT) gauche-config.$(OBJEXT) $(LIBS) |
| 51 |
+ $(RELINK) $(gosh_LDFLAGS) -o gosh$(EXEEXT) $(gosh_OBJECTS) $(gosh_LDADD) |
| 52 |
+ $(RELINK) -o gauche-config$(EXEEXT) gauche-config.$(OBJEXT) |
| 53 |
|
| 54 |
$(OBJECTS) : $(HEADERS) |
| 55 |
|
| 56 |
@@ -415,7 +416,7 @@ $(LIBGAUCHE).$(SOEXT) : $(libgauche_OBJE |
| 57 |
$(POSTBUILD) |
| 58 |
|
| 59 |
gauche-config$(EXEEXT) : gauche-config.$(OBJEXT) |
| 60 |
- $(LINK) -o gauche-config$(EXEEXT) gauche-config.$(OBJEXT) $(LIBS) |
| 61 |
+ $(LINK) -o gauche-config$(EXEEXT) gauche-config.$(OBJEXT) |
| 62 |
|
| 63 |
# we need thread settings in sync with gc. |
| 64 |
gauche/config_threads.h : $(top_builddir)/gc/include/config.h |