]> git.ipfire.org Git - thirdparty/make.git/commitdiff
* Makefile.am, w32/Makefile.am: Fix *os.c for Windows builds.
authorPaul Smith <psmith@gnu.org>
Sat, 2 Apr 2016 21:18:40 +0000 (17:18 -0400)
committerPaul Smith <psmith@gnu.org>
Mon, 4 Apr 2016 05:36:08 +0000 (01:36 -0400)
Original change provided by Luke Allardyce <lukeallardyce@gmail.com>

Makefile.am
w32/Makefile.am

index 96c4ae20581e53e9309bb308164972ca15188a3a..edd6077d0ffc2d8fce53b6bdb5e2c1f90938bb8f 100644 (file)
@@ -26,6 +26,9 @@ if WINDOWSENV
   MAYBE_W32 =  w32
   W32INC =     -I $(top_srcdir)/w32/include
   W32LIB =     -Lw32 -lw32
+  ossrc =
+else
+  ossrc =      posixos.c
 endif
 
 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 \
                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 \
                hash.c $(remote)
 
index af97768b419f4ded229c4f94ab2aae14210a79d5..b0b4734765ffe837cfeac4843791b9556d4eb6a3 100644 (file)
@@ -20,6 +20,6 @@ AUTOMAKE_OPTIONS = subdir-objects
 noinst_LIBRARIES = libw32.a
 
 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)