diff options
Diffstat (limited to 'cpp/src')
| -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 |
5 files changed, 7 insertions, 6 deletions
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) |