diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-01-08 15:43:57 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-01-08 15:43:57 +0800 |
| commit | 4c09b9a5a655870a9146dd5af4af12a6ff17d125 (patch) | |
| tree | ce8ef6832096605140dd14e0fe33e78e57b2e4c2 /lib-src | |
| parent | 8dbfb924b6d4b69ff3a8e2d1d02583833c1d2293 (diff) | |
| parent | 5d1e14bd8b9a11ab860937d3ab97248ddeef30b1 (diff) | |
| download | emacs-4c09b9a5a655870a9146dd5af4af12a6ff17d125.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/android
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/Makefile.in | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index ef611187bee..7d491557529 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -201,18 +201,18 @@ LIBRESOLV=@LIBRESOLV@ ## -llockfile if HAVE_LIBLOCKFILE or -lmail if HAVE_LIBMAIL LIBS_MAIL=@LIBS_MAIL@ ## empty or -lrt or -lposix4 if HAVE_CLOCK_GETTIME -LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ ## empty or -lbcrypt or -ladvapi32 -LIB_GETRANDOM = @LIB_GETRANDOM@ +GETRANDOM_LIB = @GETRANDOM_LIB@ ## Whatever libraries are needed for euidaccess -LIB_EACCESS=@LIB_EACCESS@ +EUIDACCESS_LIBGEN=@EUIDACCESS_LIBGEN@ ## Libraries needed for file_has_acl -LIB_HAS_ACL=@LIB_HAS_ACL@ +FILE_HAS_ACL_LIB=@FILE_HAS_ACL_LIB@ ## empty or -lwsock2 for MinGW LIB_WSOCK32=@LIB_WSOCK32@ ## Extra libraries for etags -LIBS_ETAGS = $(LIB_CLOCK_GETTIME) $(LIB_GETRANDOM) +LIBS_ETAGS = $(CLOCK_TIME_LIB) $(GETRANDOM_LIB) HAVE_SECCOMP=@HAVE_SECCOMP@ HAVE_LIBSECCOMP=@HAVE_LIBSECCOMP@ @@ -434,12 +434,14 @@ pop.o: ${srcdir}/pop.c ${srcdir}/pop.h ${srcdir}/../lib/min-max.h $(config_h) emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(config_h) $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< \ $(NTLIB) $(LOADLIBES) \ - $(LIB_WSOCK32) $(LIB_EACCESS) $(LIB_HAS_ACL) $(LIBS_ECLIENT) -o $@ + $(LIB_WSOCK32) $(EUIDACCESS_LIBGEN) \ + $(FILE_HAS_ACL_LIB) $(LIBS_ECLIENT) \ + -o $@ emacsclientw${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(CLIENTRES) $(config_h) $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows $< \ $(LOADLIBES) \ - $(LIB_WSOCK32) $(LIB_EACCESS) $(LIBS_ECLIENT) -o $@ + $(LIB_WSOCK32) $(EUIDACCESS_LIBGEN) $(LIBS_ECLIENT) -o $@ be-resources: ${srcdir}/be_resources.cc ${config_h} $(AM_V_CXXLD)$(CXX) ${ALL_CXXFLAGS} ${HAIKU_LIBS} $< -o $@ |