HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from trunk, resolve conflicts.
[bpt/emacs.git]
/
lib
/
Makefile.am
diff --git
a/lib/Makefile.am
b/lib/Makefile.am
index
28fdafd
..
2ba63f3
100644
(file)
--- a/
lib/Makefile.am
+++ b/
lib/Makefile.am
@@
-4,7
+4,13
@@
MOSTLYCLEANDIRS =
MOSTLYCLEANFILES =
noinst_LIBRARIES =
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
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
include gnulib.mk
+
+libgnu_a_SOURCES += openat-die.c save-cwd.c
+endif