public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin] Move source files used in utils/mingw/ into that subdirectory
@ 2021-05-10 15:59 Jon TURNEY
0 siblings, 0 replies; only message in thread
From: Jon TURNEY @ 2021-05-10 15:59 UTC (permalink / raw)
To: cygwin-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=b8bd9d1b012cb03861b74f128d97f42e0166a16e
commit b8bd9d1b012cb03861b74f128d97f42e0166a16e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Apr 27 23:41:07 2021 +0100
Move source files used in utils/mingw/ into that subdirectory
Move all the source files used in utils/mingw/ into that subdirectory,
so the built objects are in the expected place.
(path.cc requires some more unpicking, and even then there is genuinely
some shared code, so use a trivial file which includes the real path.cc
so the object file is generated where expected)
Diff:
---
winsup/utils/mingw/Makefile.am | 23 +++++++++++++----------
winsup/utils/{ => mingw}/bloda.cc | 0
winsup/utils/{ => mingw}/cygcheck.cc | 0
winsup/utils/{ => mingw}/cygwin-console-helper.cc | 0
winsup/utils/{ => mingw}/dump_setup.cc | 0
winsup/utils/{ => mingw}/ldh.cc | 0
winsup/utils/mingw/path.cc | 1 +
winsup/utils/{ => mingw}/strace.cc | 10 +++++-----
winsup/utils/{ => mingw}/testsuite.cc | 0
winsup/utils/{ => mingw}/testsuite.h | 0
10 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/winsup/utils/mingw/Makefile.am b/winsup/utils/mingw/Makefile.am
index a14725902..73abc4264 100644
--- a/winsup/utils/mingw/Makefile.am
+++ b/winsup/utils/mingw/Makefile.am
@@ -25,26 +25,29 @@ bin_PROGRAMS = \
strace
cygcheck_SOURCES = \
- ../bloda.cc \
- ../cygcheck.cc \
- ../dump_setup.cc \
- ../path.cc
+ bloda.cc \
+ cygcheck.cc \
+ dump_setup.cc \
+ path.cc
+cygcheck_CPPFLAGS=-I$(srcdir)/..
cygcheck_LDADD = -lz -lwininet -lpsapi -lntdll
-cygwin_console_helper_SOURCES = ../cygwin-console-helper.cc
+cygwin_console_helper_SOURCES = cygwin-console-helper.cc
-ldh_SOURCES = ../ldh.cc
+ldh_SOURCES = ldh.cc
strace_SOURCES = \
- ../path.cc \
- ../strace.cc
+ path.cc \
+ strace.cc
+strace_CPPFLAGS=-I$(srcdir)/..
strace_LDADD = -lntdll
noinst_PROGRAMS = path-testsuite
path_testsuite_SOURCES = \
- ../path.cc \
- ../testsuite.cc
+ path.cc \
+ testsuite.cc
+path_testsuite_CPPFLAGS=-I$(srcdir)/..
path_testsuite_CXXFLAGS = -DTESTSUITE
TESTS = path-testsuite
diff --git a/winsup/utils/bloda.cc b/winsup/utils/mingw/bloda.cc
similarity index 100%
rename from winsup/utils/bloda.cc
rename to winsup/utils/mingw/bloda.cc
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/mingw/cygcheck.cc
similarity index 100%
rename from winsup/utils/cygcheck.cc
rename to winsup/utils/mingw/cygcheck.cc
diff --git a/winsup/utils/cygwin-console-helper.cc b/winsup/utils/mingw/cygwin-console-helper.cc
similarity index 100%
rename from winsup/utils/cygwin-console-helper.cc
rename to winsup/utils/mingw/cygwin-console-helper.cc
diff --git a/winsup/utils/dump_setup.cc b/winsup/utils/mingw/dump_setup.cc
similarity index 100%
rename from winsup/utils/dump_setup.cc
rename to winsup/utils/mingw/dump_setup.cc
diff --git a/winsup/utils/ldh.cc b/winsup/utils/mingw/ldh.cc
similarity index 100%
rename from winsup/utils/ldh.cc
rename to winsup/utils/mingw/ldh.cc
diff --git a/winsup/utils/mingw/path.cc b/winsup/utils/mingw/path.cc
new file mode 100644
index 000000000..dd275b61d
--- /dev/null
+++ b/winsup/utils/mingw/path.cc
@@ -0,0 +1 @@
+#include "../path.cc"
diff --git a/winsup/utils/strace.cc b/winsup/utils/mingw/strace.cc
similarity index 99%
rename from winsup/utils/strace.cc
rename to winsup/utils/mingw/strace.cc
index b96ad40c1..a7797600c 100644
--- a/winsup/utils/strace.cc
+++ b/winsup/utils/mingw/strace.cc
@@ -21,11 +21,11 @@ details. */
#include <time.h>
#include <signal.h>
#include <errno.h>
-#include "../cygwin/include/sys/strace.h"
-#include "../cygwin/include/sys/cygwin.h"
-#include "../cygwin/include/cygwin/version.h"
-#include "../cygwin/cygtls_padsize.h"
-#include "../cygwin/gcc_seh.h"
+#include "../../cygwin/include/sys/strace.h"
+#include "../../cygwin/include/sys/cygwin.h"
+#include "../../cygwin/include/cygwin/version.h"
+#include "../../cygwin/cygtls_padsize.h"
+#include "../../cygwin/gcc_seh.h"
#include "path.h"
#undef cygwin_internal
#include "loadlib.h"
diff --git a/winsup/utils/testsuite.cc b/winsup/utils/mingw/testsuite.cc
similarity index 100%
rename from winsup/utils/testsuite.cc
rename to winsup/utils/mingw/testsuite.cc
diff --git a/winsup/utils/testsuite.h b/winsup/utils/mingw/testsuite.h
similarity index 100%
rename from winsup/utils/testsuite.h
rename to winsup/utils/mingw/testsuite.h
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-05-10 15:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-10 15:59 [newlib-cygwin] Move source files used in utils/mingw/ into that subdirectory Jon TURNEY
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).