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)
This commit is contained in:
parent
9ce70bf450
commit
b8bd9d1b01
|
@ -25,26 +25,29 @@ bin_PROGRAMS = \
|
||||||
strace
|
strace
|
||||||
|
|
||||||
cygcheck_SOURCES = \
|
cygcheck_SOURCES = \
|
||||||
../bloda.cc \
|
bloda.cc \
|
||||||
../cygcheck.cc \
|
cygcheck.cc \
|
||||||
../dump_setup.cc \
|
dump_setup.cc \
|
||||||
../path.cc
|
path.cc
|
||||||
|
cygcheck_CPPFLAGS=-I$(srcdir)/..
|
||||||
cygcheck_LDADD = -lz -lwininet -lpsapi -lntdll
|
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 = \
|
strace_SOURCES = \
|
||||||
../path.cc \
|
path.cc \
|
||||||
../strace.cc
|
strace.cc
|
||||||
|
strace_CPPFLAGS=-I$(srcdir)/..
|
||||||
strace_LDADD = -lntdll
|
strace_LDADD = -lntdll
|
||||||
|
|
||||||
noinst_PROGRAMS = path-testsuite
|
noinst_PROGRAMS = path-testsuite
|
||||||
|
|
||||||
path_testsuite_SOURCES = \
|
path_testsuite_SOURCES = \
|
||||||
../path.cc \
|
path.cc \
|
||||||
../testsuite.cc
|
testsuite.cc
|
||||||
|
path_testsuite_CPPFLAGS=-I$(srcdir)/..
|
||||||
path_testsuite_CXXFLAGS = -DTESTSUITE
|
path_testsuite_CXXFLAGS = -DTESTSUITE
|
||||||
|
|
||||||
TESTS = path-testsuite
|
TESTS = path-testsuite
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
#include "../path.cc"
|
|
@ -21,11 +21,11 @@ details. */
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include "../cygwin/include/sys/strace.h"
|
#include "../../cygwin/include/sys/strace.h"
|
||||||
#include "../cygwin/include/sys/cygwin.h"
|
#include "../../cygwin/include/sys/cygwin.h"
|
||||||
#include "../cygwin/include/cygwin/version.h"
|
#include "../../cygwin/include/cygwin/version.h"
|
||||||
#include "../cygwin/cygtls_padsize.h"
|
#include "../../cygwin/cygtls_padsize.h"
|
||||||
#include "../cygwin/gcc_seh.h"
|
#include "../../cygwin/gcc_seh.h"
|
||||||
#include "path.h"
|
#include "path.h"
|
||||||
#undef cygwin_internal
|
#undef cygwin_internal
|
||||||
#include "loadlib.h"
|
#include "loadlib.h"
|
Loading…
Reference in New Issue