Merge from trunk, resolve conflicts.
[bpt/emacs.git] / lib / Makefile.am
index a341609..2ba63f3 100644 (file)
@@ -4,9 +4,13 @@ MOSTLYCLEANDIRS =
 MOSTLYCLEANFILES =
 noinst_LIBRARIES =
 
-AM_CFLAGS = $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
+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