diff options
Diffstat (limited to 'lib/Makefile.in')
| -rw-r--r-- | lib/Makefile.in | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/lib/Makefile.in b/lib/Makefile.in index 1f5b154f355..8b950136241 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright 2017 Free Software Foundation, Inc. +# Copyright 2017-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -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 = +-include ${top_builddir}/src/verbose.mk -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 = +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,29 +64,37 @@ 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. +# 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 = $(gl_LIBOBJS) \ +libgnu_a_OBJECTS = fingerprint.o $(gl_LIBOBJS) \ $(patsubst %.c,%.o,$(filter %.c,$(libgnu_a_SOURCES))) -libegnu_a_OBJECTS = $(patsubst %.o,e-%.o,$(libgnu_a_OBJECTS)) +for_emacs_OBJECTS = $(filter-out $(not_emacs_OBJECTS),$(libgnu_a_OBJECTS)) +libegnu_a_OBJECTS = $(patsubst %.o,e-%.o,$(for_emacs_OBJECTS)) $(libegnu_a_OBJECTS) $(libgnu_a_OBJECTS): $(BUILT_SOURCES) .c.o: - $(AM_V_CC)$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< + $(AM_V_CC)$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $< e-%.o: %.c $(AM_V_CC)$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -Demacs -o $@ $< all: libgnu.a $(if $(HYBRID_MALLOC),libegnu.a) libgnu.a: $(libgnu_a_OBJECTS) - $(AM_V_at)rm -f $@ - $(AM_V_AR)$(AR) $(ARFLAGS) $@ $(libgnu_a_OBJECTS) + $(AM_V_AR)rm -f $@ + $(AM_V_at)$(AR) $(ARFLAGS) $@ $(libgnu_a_OBJECTS) $(AM_V_at)$(RANLIB) $@ libegnu.a: $(libegnu_a_OBJECTS) - $(AM_V_at)rm -f $@ - $(AM_V_AR)$(AR) $(ARFLAGS) $@ $(libegnu_a_OBJECTS) + $(AM_V_AR)rm -f $@ + $(AM_V_at)$(AR) $(ARFLAGS) $@ $(libegnu_a_OBJECTS) $(AM_V_at)$(RANLIB) $@ ETAGS = ../lib-src/etags$(EXEEXT) @@ -112,7 +107,7 @@ TAGS: $(ETAGS) $(tagsfiles) .PHONY: $(ETAGS) tags clean: - rm -f *.[ao] *-t \#* $(DEPDIR)/* + rm -f ./*.[ao] ./*/*.o ./*-t \#* $(DEPDIR)/*.d $(DEPDIR)/*/*.d mostlyclean: clean rm -f $(filter-out %-t,$(MOSTLYCLEANFILES)) distclean bootstrap-clean: mostlyclean @@ -120,6 +115,8 @@ distclean bootstrap-clean: mostlyclean rm -fr $(DEPDIR) maintainer-clean: distclean rm -f TAGS gnulib.mk + -rmdir malloc sys 2>/dev/null || true + .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. |