diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-08-09 17:00:19 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-08-09 17:00:19 +0000 |
| commit | 8dbf67f31c8fffa0d158ff57e6e451c97d73653d (patch) | |
| tree | 21a15844ed05e791fea61f8f28a4bab271547bf9 /cpp | |
| parent | BCB port (diff) | |
| download | ice-8dbf67f31c8fffa0d158ff57e6e451c97d73653d.tar.bz2 ice-8dbf67f31c8fffa0d158ff57e6e451c97d73653d.tar.xz ice-8dbf67f31c8fffa0d158ff57e6e451c97d73653d.zip | |
Fix for distribution build
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules.mak | 3 | ||||
| -rw-r--r-- | cpp/demo/Freeze/library/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/demo/Freeze/phonebook/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/FreezeScript/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/IceGrid/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/Makefile.mak | 5 | ||||
| -rw-r--r-- | cpp/src/Slice/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/test/Freeze/complex/Makefile.mak | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index c2312206d31..29c5c9c390c 100644 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -29,8 +29,7 @@ BCB = C:\Program Files\Borland\BDS\4.0 # If third party libraries are not installed in the default location # change the following setting to reflect the installation location. # -#THIRDPARTY_HOME = C:\Ice-$(VERSION)-ThirdParty -THIRDPARTY_HOME = C:\src\packages_win32 +THIRDPARTY_HOME = C:\Ice-$(VERSION)-ThirdParty # ---------------------------------------------------------------------- # Don't change anything below this line! diff --git a/cpp/demo/Freeze/library/Makefile.mak b/cpp/demo/Freeze/library/Makefile.mak index 89d693bf64c..5eb702efbfa 100644 --- a/cpp/demo/Freeze/library/Makefile.mak +++ b/cpp/demo/Freeze/library/Makefile.mak @@ -44,7 +44,7 @@ SRCS = $(OBJS:.o=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. $(CPPFLAGS) +CPPFLAGS = -I. -Idummyinclude $(CPPFLAGS) SLICE2CPPFLAGS = --ice $(SLICE2CPPFLAGS) $(CLIENT): $(OBJS) $(COBJS) diff --git a/cpp/demo/Freeze/phonebook/Makefile.mak b/cpp/demo/Freeze/phonebook/Makefile.mak index 82432cd3d80..b6c9cfa2981 100644 --- a/cpp/demo/Freeze/phonebook/Makefile.mak +++ b/cpp/demo/Freeze/phonebook/Makefile.mak @@ -44,7 +44,7 @@ SRCS = $(OBJS:.o=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. $(CPPFLAGS) +CPPFLAGS = -I. -Idummyinclude $(CPPFLAGS) $(CLIENT): $(OBJS) $(COBJS) del /q $@ diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak index 37f995965e1..9a7afe41110 100644 --- a/cpp/src/FreezeScript/Makefile.mak +++ b/cpp/src/FreezeScript/Makefile.mak @@ -39,7 +39,7 @@ HDIR = $(includedir)\FreezeScript !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I.. $(CPPFLAGS) +CPPFLAGS = -I.. -Idummyinclude $(CPPFLAGS) LINKWITH = slice$(LIBSUFFIX).lib icexml$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib $(LIBS) $(DB_LIBS) $(TRANSFORMDB): $(TRANSFORM_OBJS) $(COMMON_OBJS) diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index 6a84a90818d..1c1d372e343 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -122,7 +122,7 @@ NLINKWITH = $(ALINKWITH) icestorm$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib icebox$ !ifdef BUILD_UTILS -CPPFLAGS = -I. -I.. $(CPPFLAGS) +CPPFLAGS = -I. -I.. -Idummyinclude $(CPPFLAGS) !else diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak index 827b7547212..6b31c1521b0 100644 --- a/cpp/src/IceStorm/Makefile.mak +++ b/cpp/src/IceStorm/Makefile.mak @@ -62,7 +62,7 @@ SDIR = $(slicedir)\IceStorm !include $(top_srcdir)\config\Make.rules.mak -CPPFLAGS = -I.. $(CPPFLAGS) +CPPFLAGS = -I.. -Idummyinclude $(CPPFLAGS) SLICE2CPPFLAGS = --ice --include-dir IceStorm $(SLICE2CPPFLAGS) LINKWITH = $(LIBS) icestorm$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib ALINKWITH = $(LIBS) icestorm$(LIBSUFFIX).lib icexml$(LIBSUFFIX).lib diff --git a/cpp/src/Makefile.mak b/cpp/src/Makefile.mak index 89d11364a1c..a9fdf01aaa3 100644 --- a/cpp/src/Makefile.mak +++ b/cpp/src/Makefile.mak @@ -37,5 +37,6 @@ SUBDIRS = IceUtil \ $(EVERYTHING):: @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" & \ - cmd /c "cd %i & $(MAKE) -f Makefile.mak $@" + @if exist %i \ + @echo "making $@ in %i" & \ + cmd /c "cd %i & $(MAKE) -f Makefile.mak $@" diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak index 9847338b451..007233f8e80 100644 --- a/cpp/src/Slice/Makefile.mak +++ b/cpp/src/Slice/Makefile.mak @@ -30,7 +30,7 @@ SRCS = $(OBJS:.o=.cpp) !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I.. $(CPPFLAGS) -DSLICE_API_EXPORTS +CPPFLAGS = -I.. -Idummyinclude $(CPPFLAGS) -DSLICE_API_EXPORTS $(LIBNAME): $(DLLNAME) diff --git a/cpp/test/Freeze/complex/Makefile.mak b/cpp/test/Freeze/complex/Makefile.mak index aab63f49105..524ea947178 100644 --- a/cpp/test/Freeze/complex/Makefile.mak +++ b/cpp/test/Freeze/complex/Makefile.mak @@ -24,7 +24,7 @@ SRCS = $(OBJS:.o=.cpp) !include $(top_srcdir)\config\Make.rules.mak -CPPFLAGS = -I. -I../../include $(CPPFLAGS) +CPPFLAGS = -I. -Idummyinclude -I../../include $(CPPFLAGS) $(CLIENT): $(OBJS) del /q $@ |