Update of /cvsroot/mingw/runtime/profile
In directory sc8-pr-cvs1:/tmp/cvs-serv32623/profile
Modified Files:
Makefile.in configure configure.in
Log Message:
Merge winsup changes
Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/runtime/profile/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.in 3 May 2003 13:48:47 -0000 1.5
--- Makefile.in 6 May 2003 13:29:09 -0000 1.6
***************
*** 48,57 ****
THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_DLL_VERSION).dll
INCLUDES = -I$(srcdir) -I$(srcdir)/../include \
- -I$(srcdir)/../../w32api/include \
-nostdinc -nostdinc++ \
-iwithprefixbefore include
! ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(MNO_CYGWIN)
! ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) $(MNO_CYGWIN)
AS = @AS@
--- 48,57 ----
THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_DLL_VERSION).dll
+ W32API_INCLUDE = @W32API_INCLUDE@
INCLUDES = -I$(srcdir) -I$(srcdir)/../include \
-nostdinc -nostdinc++ \
-iwithprefixbefore include
! ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
! ALL_CXXFLAGS = $(CXXFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
AS = @AS@
***************
*** 82,92 ****
# The only CRT dependency is atexit.
gcrt0.o: gcrt0.c
! $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $?
gcrt1.o: gcrt0.c
! $(CC) -U__MSVCRT__ -c -o $@ $(CPPFLAGS) $(CFLAGS) $?
gcrt2.o: gcrt0.c
! $(CC) -D__MSVCRT__ -c -o $@ $(CPPFLAGS) $(CFLAGS) $?
#
--- 82,92 ----
# The only CRT dependency is atexit.
gcrt0.o: gcrt0.c
! $(CC) -c -o $@ $(CPPFLAGS) $(ALL_CFLAGS) $?
gcrt1.o: gcrt0.c
! $(CC) -U__MSVCRT__ -c -o $@ $(CPPFLAGS) $(ALL_CFLAGS) $?
gcrt2.o: gcrt0.c
! $(CC) -D__MSVCRT__ -c -o $@ $(CPPFLAGS) $(ALL_CFLAGS) $?
#
Index: configure
===================================================================
RCS file: /cvsroot/mingw/runtime/profile/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configure 14 Jun 2002 15:12:55 -0000 1.3
--- configure 6 May 2003 13:29:09 -0000 1.4
***************
*** 672,675 ****
--- 672,678 ----
esac
+ W32API_INCLUDE='$(subdir)/../w32api/include'
+
+
***************
*** 690,694 ****
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
! echo "configure:693: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
--- 693,697 ----
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
! echo "configure:696: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
***************
*** 914,917 ****
--- 917,921 ----
s%@LIBGMON_A@...
s%@CRT0S@...
+ s%@W32API_INCLUDE@...
s%@INSTALL_PROGRAM@...
s%@INSTALL_SCRIPT@...
Index: configure.in
===================================================================
RCS file: /cvsroot/mingw/runtime/profile/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configure.in 14 Jun 2002 15:12:55 -0000 1.3
--- configure.in 6 May 2003 13:29:09 -0000 1.4
***************
*** 62,65 ****
--- 62,67 ----
esac
+ W32API_INCLUDE='$(subdir)/../w32api/include'
+
AC_SUBST(CRT_ID)
AC_SUBST(RUNTIME)
***************
*** 67,70 ****
--- 69,73 ----
AC_SUBST(LIBGMON_A)
AC_SUBST(CRT0S)
+ AC_SUBST(W32API_INCLUDE)
AC_PROG_INSTALL
|
