Port of merge request 49 to newlib

Wayne Porter made !49 which added Cygwin support to the master branch
This is the port of those changes to newlib

1 files changed, 89 insertions, 14 deletions

diff --git a/Makefile.am b/Makefile.am
index d1dcf28..97dcd4f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 CYGWINFLAGS =
 if CYGWIN
-  CYGWINFLAGS += -lintl
+CYGWINFLAGS += -lintl
+usrbin_exec_PROGRAMS =
 endif
 
 AM_CPPFLAGS = \
@@ -24,8 +25,21 @@ SUBDIRS = \
 AM_CFLAGS = -Iproc
 LDADD = ./proc/libprocps.la $(CYGWINFLAGS)
 
-transform = s/pscommand/ps/; $(program_transform_name)
+if CYGWIN
+AM_LDFLAGS += ./proc/libprocps.la $(CYGWINFLAGS)
+endif
+
+transform =
+
+if !CYGWIN
+transform += s/pscommand/ps/; $(program_transform_name)
+sbin_PROGRAMS = \
+	sysctl
+else
+transform += s/pscommand/procps/; $(program_transform_name)
+endif
 
+if !CYGWIN
 bin_PROGRAMS = \
 	ps/pscommand \
 	free \
@@ -37,9 +51,17 @@ bin_PROGRAMS = \
 	uptime \
 	vmstat \
 	w
-
-sbin_PROGRAMS = \
-	sysctl
+else
+usrbin_exec_PROGRAMS += \
+	ps/pscommand \
+	free \
+	pgrep \
+	pkill \
+	pmap \
+	uptime \
+	vmstat \
+	w
+endif
 
 lib_LTLIBRARIES = \
 	proc/libprocps.la
@@ -49,14 +71,9 @@ dist_man_MANS = \
 	pgrep.1 \
 	pkill.1 \
 	pmap.1 \
-	pwdx.1 \
-	sysctl.8 \
-	sysctl.conf.5 \
-	tload.1 \
 	uptime.1 \
 	vmstat.8 \
 	w.1 \
-	ps/ps.1 \
 	doc/libproc.3 \
 	doc/procps_linux_version.3 \
 	doc/procps_pids_new.3 \
@@ -70,6 +87,15 @@ dist_man_MANS = \
 	doc/procps_uptime_sprint.3 \
 	doc/procps_uptime_sprint_short.3
 
+if !CYGWIN
+dist_man_MANS += \
+	pwdx.1 \
+	tload.1 \
+	sysctl.8 \
+	sysctl.conf.5 \
+	ps/ps.1
+endif
+
 EXTRA_DIST = \
 	.version \
 	autogen.sh \
@@ -78,18 +104,26 @@ EXTRA_DIST = \
 	misc/git-version-gen \
 	Documentation/CodingStyle.md \
 	Documentation/TODO \
-	sysctl.conf \
 	ps/HACKING \
 	ps/regression \
 	$(DIST_MAN_POTS)
 
+if !CYGWIN
+EXTRA_DIST += \
+	sysctl.conf
+endif
+
 procpsngdir = $(docdir)
 dist_procpsng_DATA = \
 	Documentation/bugs.md \
 	Documentation/FAQ
 
 if BUILD_PIDOF
+if !CYGWIN
 bin_PROGRAMS += pidof
+else
+usrbin_exec_PROGRAMS += pidof
+endif
 dist_man_MANS += pidof.1
 pidof_SOURCES = pidof.c lib/fileutils.c
 else
@@ -97,7 +131,12 @@ else
 endif
 
 if BUILD_KILL
+if CYGWIN
+transform += ;s/^kill/prockill/; $(program_transform_name)
+usrbin_exec_PROGRAMS += kill
+else
 bin_PROGRAMS += kill
+endif
 dist_man_MANS += kill.1
 kill_SOURCES = kill.c lib/strutils.c lib/fileutils.c lib/signals.c
 kill_LDADD =
@@ -106,16 +145,27 @@ else
 endif
 
 if WITH_NCURSES
+if !CYGWIN
 bin_PROGRAMS += \
-	slabtop \
 	watch \
 	top/top
+else
+usrbin_exec_PROGRAMS += \
+	watch \
+	top/top
+endif
+
 dist_man_MANS += \
-	slabtop.1 \
 	watch.1 \
 	top/top.1
+if !CYGWIN
+bin_PROGRAMS += \
+	slabtop
+dist_man_MANS += \
+	slabtop.1
 slabtop_SOURCES = slabtop.c lib/strutils.c lib/fileutils.c
 slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
+endif
 watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c
 watch_LDADD = @WATCH_NCURSES_LIBS@ $(CYGWINFLAGS)
 top_top_SOURCES = \
@@ -126,16 +176,22 @@ top_top_SOURCES = \
 	lib/fileutils.c \
 	lib/signals.c
 if CYGWIN
-  top_top_SOURCES += lib/strverscmp.c
+top_top_SOURCES += lib/strverscmp.c
 endif
 
 top_top_LDADD = $(LDADD) @NCURSES_LIBS@ $(DL_LIB)
 endif
 
 if BUILD_SKILL
+if !CYGWIN
 bin_PROGRAMS += \
 	skill \
 	snice
+else
+usrbin_exec_PROGRAMS += \
+	skill \
+	snice
+endif
 skill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/signals.c
 snice_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/signals.c
 dist_man_MANS += \
@@ -151,10 +207,12 @@ free_SOURCES = free.c lib/strutils.c lib/fileutils.c
 pgrep_SOURCES = pgrep.c lib/fileutils.c lib/signals.c
 pkill_SOURCES = pgrep.c lib/fileutils.c lib/signals.c
 pmap_SOURCES = pmap.c lib/fileutils.c
+if !CYGWIN
 pwdx_SOURCES = pwdx.c lib/fileutils.c
 pwdx_LDADD= $(CYGWINFLAGS)
 sysctl_SOURCES = sysctl.c lib/fileutils.c
 sysctl_LDADD=
+endif
 tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c
 uptime_SOURCES = uptime.c lib/fileutils.c
 vmstat_SOURCES = vmstat.c lib/strutils.c lib/fileutils.c
@@ -284,9 +342,26 @@ proc_test_version_LDADD = proc/libprocps.la
 lib_test_strtod_nol_SOURCES = lib/test_strtod_nol.c lib/strutils.c
 lib_test_strtod_nol_LDADD = $(CYGWINFLAGS)
 
+if CYGWIN
+	skill_LDADD = $(CYGWINFLAGS)
+	kill_LDADD = $(CYGWINFLAGS)
+	free_LDADD = $(CYGWINFLAGS)
+	pgrep_LDADD = $(CYGWINFLAGS)
+	pkill_LDADD = $(CYGWINFLAGS)
+	pidof_LDADD = $(CYGWINFLAGS)
+	pmap_LDADD = $(CYGWINFLAGS)
+	snice_LDADD = $(CYGWINFLAGS)
+	tload_LDADD = $(CYGWINFLAGS)
+	uptime_LDADD = $(CYGWINFLAGS)
+	w_LDADD = $(CYGWINFLAGS)
+	vmstat_LDADD = $(CYGWINFLAGS)
+endif
+
 if EXAMPLE_FILES
+if !CYGWIN
 sysconf_DATA = sysctl.conf
 endif
+endif
 
 BUILT_SOURCES = $(top_srcdir)/.version