summaryrefslogtreecommitdiff
path: root/cpp/src/slice2cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2001-08-17 10:48:40 +0000
committerMarc Laukien <marc@zeroc.com>2001-08-17 10:48:40 +0000
commit7c2da94d4a0fe61628d9335534b661db28106dc0 (patch)
treec13e87943f2e1df80d19ed52e9762a6cd12f8f6c /cpp/src/slice2cpp
parentfix (diff)
downloadice-7c2da94d4a0fe61628d9335534b661db28106dc0.tar.bz2
ice-7c2da94d4a0fe61628d9335534b661db28106dc0.tar.xz
ice-7c2da94d4a0fe61628d9335534b661db28106dc0.zip
restructuring
Diffstat (limited to 'cpp/src/slice2cpp')
-rw-r--r--cpp/src/slice2cpp/.depend6
-rw-r--r--cpp/src/slice2cpp/Gen.h4
-rw-r--r--cpp/src/slice2cpp/GenUtil.h4
-rw-r--r--cpp/src/slice2cpp/Makefile4
-rw-r--r--cpp/src/slice2cpp/slice2cpp.dsp (renamed from cpp/src/slice2cpp/cpp.dsp)28
5 files changed, 23 insertions, 23 deletions
diff --git a/cpp/src/slice2cpp/.depend b/cpp/src/slice2cpp/.depend
index de3053fcdab..7681b5dbbc3 100644
--- a/cpp/src/slice2cpp/.depend
+++ b/cpp/src/slice2cpp/.depend
@@ -1,3 +1,3 @@
-Gen.o: Gen.cpp ../../../include/Ice/Functional.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h Gen.h ../parser/Parser.h ../../../include/Ice/Shared.h ../parser/OutputUtil.h GenUtil.h
-GenUtil.o: GenUtil.cpp GenUtil.h ../parser/Parser.h ../../../include/Ice/Shared.h ../../../include/Ice/Config.h ../../../include/Ice/Handle.h ../parser/OutputUtil.h
-Main.o: Main.cpp Gen.h ../parser/Parser.h ../../../include/Ice/Shared.h ../../../include/Ice/Config.h ../../../include/Ice/Handle.h ../parser/OutputUtil.h
+Gen.o: Gen.cpp ../../include/Ice/Functional.h ../../include/Ice/Handle.h ../../include/Ice/Config.h Gen.h ../../include/Slice/Parser.h ../../include/Ice/Shared.h ../../include/Slice/OutputUtil.h GenUtil.h
+GenUtil.o: GenUtil.cpp GenUtil.h ../../include/Slice/Parser.h ../../include/Ice/Shared.h ../../include/Ice/Config.h ../../include/Ice/Handle.h ../../include/Slice/OutputUtil.h
+Main.o: Main.cpp Gen.h ../../include/Slice/Parser.h ../../include/Ice/Shared.h ../../include/Ice/Config.h ../../include/Ice/Handle.h ../../include/Slice/OutputUtil.h
diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h
index 2c07763f8fe..7019d69d868 100644
--- a/cpp/src/slice2cpp/Gen.h
+++ b/cpp/src/slice2cpp/Gen.h
@@ -11,8 +11,8 @@
#ifndef GEN_H
#define GEN_H
-#include <Parser.h>
-#include <OutputUtil.h>
+#include <Slice/Parser.h>
+#include <Slice/OutputUtil.h>
namespace Slice
{
diff --git a/cpp/src/slice2cpp/GenUtil.h b/cpp/src/slice2cpp/GenUtil.h
index 48646d52b1a..0959c4eef80 100644
--- a/cpp/src/slice2cpp/GenUtil.h
+++ b/cpp/src/slice2cpp/GenUtil.h
@@ -11,8 +11,8 @@
#ifndef GEN_UTIL_H
#define GEN_UTIL_H
-#include <Parser.h>
-#include <OutputUtil.h>
+#include <Slice/Parser.h>
+#include <Slice/OutputUtil.h>
namespace Slice
{
diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile
index 4087295d345..b74e28f90b6 100644
--- a/cpp/src/slice2cpp/Makefile
+++ b/cpp/src/slice2cpp/Makefile
@@ -8,7 +8,7 @@
#
# **********************************************************************
-top_srcdir = ../../..
+top_srcdir = ../..
NAME = $(top_srcdir)/bin/slice2cpp
@@ -22,7 +22,7 @@ SRCS = $(OBJS:.o=.cpp)
include $(top_srcdir)/config/Make.rules
-CPPFLAGS := -I. -I../parser $(CPPFLAGS)
+CPPFLAGS := -I. $(CPPFLAGS)
$(NAME): $(OBJS)
rm -f $@
diff --git a/cpp/src/slice2cpp/cpp.dsp b/cpp/src/slice2cpp/slice2cpp.dsp
index 917b55e6678..627a576c830 100644
--- a/cpp/src/slice2cpp/cpp.dsp
+++ b/cpp/src/slice2cpp/slice2cpp.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="cpp" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="slice2cpp" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=cpp - Win32 Debug
+CFG=slice2cpp - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "cpp.mak".
+!MESSAGE NMAKE /f "slice2cpp.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "cpp.mak" CFG="cpp - Win32 Debug"
+!MESSAGE NMAKE /f "slice2cpp.mak" CFG="slice2cpp - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "cpp - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "cpp - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "slice2cpp - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "slice2cpp - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=cpp - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "cpp - Win32 Release"
+!IF "$(CFG)" == "slice2cpp - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "." /I "../../../include" /I "../parser" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "." /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,9 +50,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 jtc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj /nologo /subsystem:console /machine:I386 /out:"../../../bin/slice2cpp.exe" /libpath:"../../../lib"
+# ADD LINK32 jtc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj /nologo /subsystem:console /machine:I386 /out:"../../bin/slice2cpp.exe" /libpath:"../../lib"
-!ELSEIF "$(CFG)" == "cpp - Win32 Debug"
+!ELSEIF "$(CFG)" == "slice2cpp - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -66,7 +66,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I "../../../include" /I "../parser" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,14 +74,14 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 jtcd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj /nologo /subsystem:console /debug /machine:I386 /out:"../../../bin/slice2cpp.exe" /pdbtype:sept /libpath:"../../../lib"
+# ADD LINK32 jtcd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/slice2cpp.exe" /pdbtype:sept /libpath:"../../lib"
!ENDIF
# Begin Target
-# Name "cpp - Win32 Release"
-# Name "cpp - Win32 Debug"
+# Name "slice2cpp - Win32 Release"
+# Name "slice2cpp - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"