Changeset 280 in kBuild for branches/GNU/src/gmake/Makefile.am

Timestamp:

May 16, 2005 4:54:02 PM (19 years ago)

Author:

bird

Message:

Current make snaphot, 2005-05-16.

Location:

branches/GNU/src/gmake

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (6 diffs)

branches/GNU/src/gmake

@@ -34 +34 @@
 README.DOS
 README.W32
+README.OS2
 aclocal.m4
 autom4te.cache

@@ -34 +34 @@
 README.DOS
 README.W32
+README.OS2
 aclocal.m4
 autom4te.cache

branches/GNU/src/gmake/Makefile.am

@@ -4 +4 @@
 ACLOCAL_AMFLAGS =  -I config
 
-SUBDIRS =       glob config po doc
+# Only process if target is MS-Windows
+if WINDOWSENV
+  MAYBE_W32 =   w32
+  W32INC =      -I $(top_srcdir)/w32/include
+  W32LIB =      -Lw32 -lw32
+endif
+
+SUBDIRS =       glob config po doc $(MAYBE_W32)
 
 bin_PROGRAMS =  make
@@ -20 +27 @@
                 variable.c version.c vpath.c hash.c
 
-EXTRA_make_SOURCES = remote-stub.c remote-cstms.c
+EXTRA_make_SOURCES = vmsjobs.c remote-stub.c remote-cstms.c
 
 noinst_HEADERS = commands.h dep.h filedef.h job.h make.h rule.h variable.h \
@@ -26 +33 @@
 
 make_LDADD =    @LIBOBJS@ @ALLOCA@ $(GLOBLIB) @GETLOADAVG_LIBS@ @LIBINTL@
+# Only process if target is MS-Windows
+if WINDOWSENV
+    make_LDADD += $(W32LIB)
+endif
 
 man_MANS =      make.1
@@ -32 +43 @@
 
 AM_CPPFLAGS =   $(GLOBINC)
+# Only process if target is MS-Windows
+if WINDOWSENV
+    AM_CPPFLAGS +=      $(W32INC)
+endif
 
 
@@ -115 +130 @@
 .PHONY: check-loadavg check-regression
 
-check-loadavg: loadavg
+check-loadavg: loadavg$(EXEEXT)
         @echo The system uptime program believes the load average to be:
         -uptime
         @echo The GNU load average checking code thinks:
-        -./loadavg
+        -./loadavg$(EXEEXT)
 
 # The loadavg function is invoked during "make check" to test getloadavg.
@@ -158 +173 @@
 # --------------- Maintainer's Section
 
+# Tell automake that I haven't forgotten about this file and it will be
+# created before we build a distribution (see maintMakefile in the CVS
+# distribution).
+
+README:
+
 @MAINT_MAKEFILE@

@@ -34 +34 @@
 README.DOS
 README.W32
+README.OS2
 aclocal.m4
 autom4te.cache