Merge from trunk, resolve conflicts.

[bpt/emacs.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 220ba71..2ba63f3 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,6 +4,13 @@ MOSTLYCLEANDIRS =
 MOSTLYCLEANFILES =
 noinst_LIBRARIES =
 
-DEFAULT_INCLUDES = -I. -I../src -I$(top_srcdir)/src
+AM_CFLAGS = $(PROFILING_CFLAGS) $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
+DEFAULT_INCLUDES = -I. -I$(top_srcdir)/lib -I../src -I$(top_srcdir)/src
 
+if BUILDING_FOR_WINDOWSNT
+include ../nt/gnulib.mk
+else
 include gnulib.mk
+
+libgnu_a_SOURCES += openat-die.c save-cwd.c
+endif