diff options
| author | Brent Eagles <brent@zeroc.com> | 2007-11-07 22:57:25 -0330 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2007-11-07 22:58:46 -0330 |
| commit | 008343ce632d400c92be6d226ff65a827b31efb6 (patch) | |
| tree | ec2b98fb03343ef2d6782cde7059670d11b51d5d /cpp | |
| parent | - Reinserting unintentionally deleted Visual Basic demos. (diff) | |
| download | ice-008343ce632d400c92be6d226ff65a827b31efb6.tar.bz2 ice-008343ce632d400c92be6d226ff65a827b31efb6.tar.xz ice-008343ce632d400c92be6d226ff65a827b31efb6.zip | |
Fix a few straggler makefile issues with moved slice directory
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/doc/Makefile | 18 | ||||
| -rw-r--r-- | cpp/src/IceGrid/Makefile | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/cpp/doc/Makefile b/cpp/doc/Makefile index 9fd7c4464a1..c2a2c2dc30c 100644 --- a/cpp/doc/Makefile +++ b/cpp/doc/Makefile @@ -11,14 +11,14 @@ top_srcdir = .. TARGETS = reference/index.html -SLICEFILES = $(wildcard ../slice/Ice/*.ice) \ - $(wildcard ../slice/Freeze/*.ice) \ - $(wildcard ../slice/IceBox/*.ice) \ - $(wildcard ../slice/IceGrid/*.ice) \ - $(wildcard ../slice/Glacier2/*.ice) \ - $(wildcard ../slice/IceSSL/*.ice) \ - $(wildcard ../slice/IceStorm/*.ice) \ - $(wildcard ../slice/IcePatch2/*.ice) +SLICEFILES = $(wildcard ../../slice/Ice/*.ice) \ + $(wildcard ../../slice/Freeze/*.ice) \ + $(wildcard ../../slice/IceBox/*.ice) \ + $(wildcard ../../slice/IceGrid/*.ice) \ + $(wildcard ../../slice/Glacier2/*.ice) \ + $(wildcard ../../slice/IceSSL/*.ice) \ + $(wildcard ../../slice/IceStorm/*.ice) \ + $(wildcard ../../slice/IcePatch2/*.ice) include $(top_srcdir)/config/Make.rules @@ -27,7 +27,7 @@ JAVASCRIPT = symboltree.js reference/index.html: $(SLICEFILES) $(MAKE) clean - $(bindir)/slice2html --ice -I../slice --hdr=htmlHeader --ftr=htmlFooter \ + $(bindir)/slice2html --ice -I$(slicedir) --hdr=htmlHeader --ftr=htmlFooter \ --indexhdr=indexHeader --indexftr=indexFooter \ --image-dir=images --logo-url="http://www.zeroc.com" --search="/cgi-bin/swish.cgi" \ --output-dir=reference --index=3 --summary=120 $(SLICEFILES) diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile index 4797a30ccba..2ac5cac452e 100644 --- a/cpp/src/IceGrid/Makefile +++ b/cpp/src/IceGrid/Makefile @@ -172,7 +172,7 @@ $(LOCAL_HDIR)/IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(SLICE2FREEZ rm -f IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp $(SLICE2FREEZECMD) --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo \ --dict-index IceGrid::IdentityObjectInfoDict,type \ - IdentityObjectInfoDict ../../slice/Ice/Identity.ice $(LOCAL_SDIR)/Internal.ice + IdentityObjectInfoDict $(slicedir)/Ice/Identity.ice $(LOCAL_SDIR)/Internal.ice clean:: rm -f IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp |