diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lib/Makefile.in | |
parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lib/Makefile.in')
-rw-r--r-- | lib/Makefile.in | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/lib/Makefile.in b/lib/Makefile.in index 91a6b5ff3f1..ccb90c3d1b3 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -29,26 +29,9 @@ top_srcdir = @top_srcdir@ all: .PHONY: all -# 'make' verbosity. -AM_V_AR = $(am__v_AR_@AM_V@) -am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -am__v_AR_1 = - -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = - -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = - -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = +-include ${top_builddir}/src/verbose.mk + +HAVE_NATIVE_COMP = @HAVE_NATIVE_COMP@ ALL_CFLAGS= \ $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) $(DEPFLAGS) \ @@ -56,6 +39,10 @@ ALL_CFLAGS= \ -I. -I../src -I$(srcdir) -I$(srcdir)/../src \ $(if $(patsubst e-%,,$(notdir $<)),,-Demacs) +ifeq ($(HAVE_NATIVE_COMP),yes) +ALL_CFLAGS += -DGL_COMPILE_CRYPTO_STREAM +endif + SYSTEM_TYPE = @SYSTEM_TYPE@ ifeq ($(SYSTEM_TYPE),windows-nt) include $(srcdir)/../nt/gnulib-cfg.mk @@ -77,12 +64,14 @@ endif ../config.status: $(top_srcdir)/configure.ac $(top_srcdir)/m4/*.m4 $(MAKE) -C .. $(notdir $@) Makefile: ../config.status $(srcdir)/Makefile.in - $(MAKE) -C .. src/$@ + $(MAKE) -C .. lib/$@ # Object modules that need not be built for Emacs. # Emacs does not need e-regex.o (it has its own regex-emacs.c), # and building it would just waste time. -not_emacs_OBJECTS = regex.o +# Emacs also doesn't need the dynarray-related files in malloc/ and +# the replacement 'free'. +not_emacs_OBJECTS = regex.o malloc/%.o free.o libgnu_a_OBJECTS = fingerprint.o $(gl_LIBOBJS) \ $(patsubst %.c,%.o,$(filter %.c,$(libgnu_a_SOURCES))) @@ -126,8 +115,7 @@ distclean bootstrap-clean: mostlyclean rm -fr $(DEPDIR) maintainer-clean: distclean rm -f TAGS gnulib.mk -extraclean: distclean - -rmdir malloc sys 2>/dev/null + -rmdir malloc sys 2>/dev/null || true .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean |