X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/f15c8583198c3d6c26ca0c0a5b6fb019f98d6c3c..ef32be609def28e77e0652a778239bb920569466:/lwlib/Makefile.in diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index 1f332e9293..cc863f3d21 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -1,7 +1,7 @@ ### @configure_input@ # Copyright (C) 1992, 1993 Lucid, Inc. -# Copyright (C) 1994, 2001-2015 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001-2016 Free Software Foundation, Inc. # # This file is part of the Lucid Widget Library. # @@ -31,8 +31,10 @@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ PROFILING_CFLAGS = @PROFILING_CFLAGS@ -WARN_CFLAGS = `echo @WARN_CFLAGS@ | sed 's/ -Wwrite-strings//'` +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_CFLAGS := $(filter-out -Wwrite-strings,${WARN_CFLAGS}) WERROR_CFLAGS = @WERROR_CFLAGS@ +CAIRO_CFLAGS= @CAIRO_CFLAGS@ CC=@CC@ CFLAGS=@CFLAGS@ @@ -70,10 +72,15 @@ am__v_at_0 = @ am__v_at_1 = DEPDIR = deps -## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. -DEPFLAGS = @DEPFLAGS@ -## ${MKDIR_P} ${DEPDIR} (if AUTO_DEPEND); else ':'. -MKDEPDIR = @MKDEPDIR@ +AUTO_DEPEND = @AUTO_DEPEND@ + +ifeq ($(AUTO_DEPEND),yes) +DEPFLAGS = -MMD -MF ${DEPDIR}/$*.d -MP +MKDEPDIR = ${MKDIR_P} ${DEPDIR} +else +DEPFLAGS = +MKDEPDIR = : +endif ## ../src is where the generated file (config.h, globals.h) are. ## $(srcdir)/../src is where the non-generated files (lisp.h) are. @@ -83,6 +90,7 @@ MKDEPDIR = @MKDEPDIR@ ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ $(C_SWITCH_MACHINE) $(DEPFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) $(PROFILING_CFLAGS) $(CFLAGS) \ + $(CAIRO_CFLAGS) \ -Demacs -I../src \ -I$(srcdir) -I$(srcdir)/../src -I../lib -I$(srcdir)/../lib @@ -102,8 +110,11 @@ globals_h = ../src/globals.h $(globals_h): $(MAKE) -C ../src globals.h -## Insert either autodeps.mk (if AUTO_DEPEND), else deps.mk. -@lwlib_deps_frag@ +ifeq ($(AUTO_DEPEND),yes) +-include $(ALLOBJS:%.o=${DEPDIR}/%.d) +else +include $(srcdir)/deps.mk +endif .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean