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
10 changed files with 19 additions and 15 deletions
|
@ -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
|
||||
|
|
1
winsup/utils/mingw/path.cc
Normal file
1
winsup/utils/mingw/path.cc
Normal file
|
@ -0,0 +1 @@
|
|||
#include "../path.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"
|
Loading…
Add table
Reference in a new issue