* Makefile.am, w32/Makefile.am: Fix *os.c for Windows builds.

Original change provided by Luke Allardyce <lukeallardyce@gmail.com>
This commit is contained in:
Paul Smith 2016-04-02 17:18:40 -04:00
parent b8a8af6550
commit 86b20728fe
2 changed files with 5 additions and 2 deletions

View file

@ -26,6 +26,9 @@ if WINDOWSENV
MAYBE_W32 = w32 MAYBE_W32 = w32
W32INC = -I $(top_srcdir)/w32/include W32INC = -I $(top_srcdir)/w32/include
W32LIB = -Lw32 -lw32 W32LIB = -Lw32 -lw32
ossrc =
else
ossrc = posixos.c
endif endif
SUBDIRS = glob config po doc $(MAYBE_W32) SUBDIRS = glob config po doc $(MAYBE_W32)
@ -41,7 +44,7 @@ endif
make_SOURCES = ar.c arscan.c commands.c default.c dir.c expand.c file.c \ make_SOURCES = ar.c arscan.c commands.c default.c dir.c expand.c file.c \
function.c getopt.c getopt1.c guile.c implicit.c job.c load.c \ function.c getopt.c getopt1.c guile.c implicit.c job.c load.c \
loadapi.c main.c misc.c output.c posixos.c read.c remake.c \ loadapi.c main.c misc.c $(ossrc) output.c read.c remake.c \
rule.c signame.c strcache.c variable.c version.c vpath.c \ rule.c signame.c strcache.c variable.c version.c vpath.c \
hash.c $(remote) hash.c $(remote)

View file

@ -20,6 +20,6 @@ AUTOMAKE_OPTIONS = subdir-objects
noinst_LIBRARIES = libw32.a noinst_LIBRARIES = libw32.a
libw32_a_SOURCES = subproc/misc.c subproc/sub_proc.c subproc/w32err.c \ libw32_a_SOURCES = subproc/misc.c subproc/sub_proc.c subproc/w32err.c \
compat/posixfcn.c pathstuff.c compat/posixfcn.c pathstuff.c w32os.c
libw32_a_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/subproc -I$(top_srcdir) libw32_a_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/subproc -I$(top_srcdir)