[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/lib libcvs.dep libcvs.mak
From: |
Jim Hyslop |
Subject: |
[Cvs-cvs] ccvs/lib libcvs.dep libcvs.mak |
Date: |
Thu, 22 Jun 2006 17:31:43 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Changes by: Jim Hyslop <jhyslop> 06/06/22 17:31:43
Modified files:
lib : libcvs.dep libcvs.mak
Log message:
* libcvs.dsp: removed strto?max.c (moved to Windows-specific
files in ../windows-NT)
* libcvs.dep, libcvs.mak: regenerated for libcvs.dsp changes
* strtoimax.c: backed out change introduced on June 11, since it
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/libcvs.dep?cvsroot=cvs&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/libcvs.mak?cvsroot=cvs&r1=1.32&r2=1.33
Patches:
Index: libcvs.dep
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/libcvs.dep,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- libcvs.dep 14 Jun 2006 19:43:38 -0000 1.33
+++ libcvs.dep 22 Jun 2006 17:31:43 -0000 1.34
@@ -414,25 +414,6 @@
".\timespec.h"\
-.\strtoimax.c : \
- "..\windows-NT\config.h"\
- "..\windows-NT\stdint.h"\
- "..\windows-NT\woe32.h"\
- ".\inttypes.h"\
- ".\timespec.h"\
- ".\verify.h"\
-
-
-.\strtoumax.c : \
- "..\windows-NT\config.h"\
- "..\windows-NT\stdint.h"\
- "..\windows-NT\woe32.h"\
- ".\inttypes.h"\
- ".\strtoimax.c"\
- ".\timespec.h"\
- ".\verify.h"\
-
-
.\tempname.c : \
"..\windows-NT\config.h"\
"..\windows-NT\stdint.h"\
Index: libcvs.mak
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/libcvs.mak,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- libcvs.mak 14 Jun 2006 19:43:38 -0000 1.32
+++ libcvs.mak 22 Jun 2006 17:31:43 -0000 1.33
@@ -25,9 +25,6 @@
NULL=nul
!ENDIF
-CPP=cl.exe
-RSC=rc.exe
-
!IF "$(CFG)" == "libcvs - Win32 Release"
OUTDIR=.\WinRel
@@ -86,8 +83,6 @@
address@hidden "$(INTDIR)\strftime.obj"
address@hidden "$(INTDIR)\stripslash.obj"
address@hidden "$(INTDIR)\strnlen1.obj"
- address@hidden "$(INTDIR)\strtoimax.obj"
- address@hidden "$(INTDIR)\strtoumax.obj"
address@hidden "$(INTDIR)\tempname.obj"
address@hidden "$(INTDIR)\time_r.obj"
address@hidden "$(INTDIR)\unsetenv.obj"
@@ -109,7 +104,40 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+CPP=cl.exe
CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\windows-NT" /I "." /D "NDEBUG" /D
"WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /D "WINDOWS32"
/Fp"$(INTDIR)\libcvs.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libcvs.bsc"
BSC32_SBRS= \
@@ -163,8 +191,6 @@
"$(INTDIR)\strftime.obj" \
"$(INTDIR)\stripslash.obj" \
"$(INTDIR)\strnlen1.obj" \
- "$(INTDIR)\strtoimax.obj" \
- "$(INTDIR)\strtoumax.obj" \
"$(INTDIR)\tempname.obj" \
"$(INTDIR)\time_r.obj" \
"$(INTDIR)\unsetenv.obj" \
@@ -240,8 +266,6 @@
address@hidden "$(INTDIR)\strftime.obj"
address@hidden "$(INTDIR)\stripslash.obj"
address@hidden "$(INTDIR)\strnlen1.obj"
- address@hidden "$(INTDIR)\strtoimax.obj"
- address@hidden "$(INTDIR)\strtoumax.obj"
address@hidden "$(INTDIR)\tempname.obj"
address@hidden "$(INTDIR)\time_r.obj"
address@hidden "$(INTDIR)\unsetenv.obj"
@@ -260,7 +284,40 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+CPP=cl.exe
CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\windows-NT" /I "." /D
"_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /D "WINDOWS32"
/Fp"$(INTDIR)\libcvs.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libcvs.bsc"
BSC32_SBRS= \
@@ -314,8 +371,6 @@
"$(INTDIR)\strftime.obj" \
"$(INTDIR)\stripslash.obj" \
"$(INTDIR)\strnlen1.obj" \
- "$(INTDIR)\strtoimax.obj" \
- "$(INTDIR)\strtoumax.obj" \
"$(INTDIR)\tempname.obj" \
"$(INTDIR)\time_r.obj" \
"$(INTDIR)\unsetenv.obj" \
@@ -335,36 +390,6 @@
!ENDIF
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("libcvs.dep")
@@ -606,16 +631,6 @@
"$(INTDIR)\strnlen1.obj" : $(SOURCE) "$(INTDIR)"
-SOURCE=.\strtoimax.c
-
-"$(INTDIR)\strtoimax.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\strtoumax.c
-
-"$(INTDIR)\strtoumax.obj" : $(SOURCE) "$(INTDIR)"
-
-
SOURCE=.\tempname.c
"$(INTDIR)\tempname.obj" : $(SOURCE) "$(INTDIR)"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs/lib libcvs.dep libcvs.mak,
Jim Hyslop <=