diff options
| author | Christopher Faylor <me@cgf.cx> | 2003-09-11 06:00:42 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2003-09-11 06:00:42 +0400 |
| commit | b07b167eec8af05999373a511f9e8fad48285caf (patch) | |
| tree | 59f3c3fb56bd7ebcbd6d33ab0d1261a457e38263 /winsup/utils | |
| parent | 704d8c321eafc33c1a8145c9c6bcb44d8827520a (diff) | |
* Makefile.in (MINGW_CXX): Define and use for mingw-compiled files.
* path.cc: Include more path info in cygwin-specific includes since the cygwin
directory is no longer included by default.
Diffstat (limited to 'winsup/utils')
| -rw-r--r-- | winsup/utils/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/utils/Makefile.in | 21 | ||||
| -rw-r--r-- | winsup/utils/path.cc | 8 |
3 files changed, 22 insertions, 13 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 76b740225..b43371b21 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,5 +1,11 @@ 2003-09-10 Christopher Faylor <cgf@redhat.com> + * Makefile.in (MINGW_CXX): Define and use for mingw-compiled files. + * path.cc: Include more path info in cygwin-specific includes since the + cygwin directory is no longer included by default. + +2003-09-10 Christopher Faylor <cgf@redhat.com> + * Makefile.in: More fixups to adjust for the fact that mingw_getopt.o is no longer built. diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index a4b204602..0641049ee 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -66,10 +66,11 @@ ALL_LDLIBS:=${patsubst $(w32api_lib)/lib%.a,-l%,\ LIBICONV:=@libiconv@ MINGW_LIB:=$(mingw_build)/libmingw32.a DUMPER_LIB:=${libbfd} ${libintl} -L$(bupdir1)/libiberty $(LIBICONV) -liberty -MINGW_LDLIBS:=$(ALL_LDLIBS) $(MINGW_LIB) +MINGW_LDLIBS:=${filter-out $(libcygwin),$(ALL_LDLIBS) $(MINGW_LIB)} MINGW_DEP_LDLIBS:=${ALL_DEP_LDLIBS} ${MINGW_LIB} ALL_LDFLAGS:=-B$(newlib_build)/libc -B$(w32api_lib) $(LDFLAGS) $(ALL_LDLIBS) DUMPER_LDFLAGS:=$(ALL_LDFLAGS) $(DUMPER_LIB) +MINGW_CXX:=${patsubst %/cygwin/include,%/mingw/include,${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)}} -I$(updir) PROGS:= cygcheck.exe cygpath.exe getfacl.exe kill.exe mkgroup.exe \ mkpasswd.exe mount.exe passwd.exe ps.exe regtool.exe setfacl.exe \ @@ -135,18 +136,18 @@ endif path.o: path.cc ifdef VERBOSE - ${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< + $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< else - @echo $(CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\ - ${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< + @echo $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\ + ${MINGW_CXX} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< endif dump_setup.o: dump_setup.cc ifdef VERBOSE - ${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $(zconf_h) $(zlib_h) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< + $(MINGW_CXX) $(zconf_h) $(zlib_h) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< else - @echo $(CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\ - ${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $(zconf_h) $(zlib_h) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< + @echo $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\ + $(MINGW_CXX) $(zconf_h) $(zlib_h) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< endif cygcheck.o: cygcheck.cc @@ -159,10 +160,10 @@ endif strace.o: strace.cc ifdef VERBOSE - ${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $< + $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $< else - @echo $(CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\ - ${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $< + @echo $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\ + $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $< endif kill.exe: kill.o $(bupdir1)/libiberty/strsignal.o diff --git a/winsup/utils/path.cc b/winsup/utils/path.cc index e985384ce..2c475fde3 100644 --- a/winsup/utils/path.cc +++ b/winsup/utils/path.cc @@ -12,12 +12,14 @@ details. */ Cygwin's mount table. If the format or location of the mount table changes, this is the file to change to match it. */ +#define str(a) #a +#define scat(a,b) str(a##b) #include <windows.h> #include <stdio.h> #include <stdlib.h> -#include <cygwin/version.h> -#include <sys/mount.h> -#include <mntent.h> +#include "cygwin/include/cygwin/version.h" +#include "cygwin/include/sys/mount.h" +#include "cygwin/include/mntent.h" /* Used when treating / and \ as equivalent. */ #define SLASH_P(ch) \ |