diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-10-03 08:53:26 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-10-03 08:53:26 -0230 |
| commit | e6215c12b36ca42e72e8190e1441bbed58030ee2 (patch) | |
| tree | 0ea4c827801a106caba433603c8837f3b05b0194 /cpp | |
| parent | Fix issues in bug 3772 (diff) | |
| download | ice-e6215c12b36ca42e72e8190e1441bbed58030ee2.tar.bz2 ice-e6215c12b36ca42e72e8190e1441bbed58030ee2.tar.xz ice-e6215c12b36ca42e72e8190e1441bbed58030ee2.zip | |
Bug 4295 - issue with Glacier2 build
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Glacier2Lib/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/Glacier2Lib/Makefile.mak | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Glacier2Lib/Makefile b/cpp/src/Glacier2Lib/Makefile index 7f0ed6e3a1a..448bc6d0961 100644 --- a/cpp/src/Glacier2Lib/Makefile +++ b/cpp/src/Glacier2Lib/Makefile @@ -40,7 +40,7 @@ CPPFLAGS := -I.. $(CPPFLAGS) $(OPENSSL_FLAGS) SLICE2CPPFLAGS := --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLAGS) LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil -$(libdir)/$(LIBFILENAME): $(OBJS) PermissionsVerifierF.cpp RouterF.cpp +$(libdir)/$(LIBFILENAME): $(OBJS) $(HDIR)/PermissionsVerifierF.cpp $(HDIR)/RouterF.cpp rm -f $@ $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) diff --git a/cpp/src/Glacier2Lib/Makefile.mak b/cpp/src/Glacier2Lib/Makefile.mak index 82ebb9aa86a..00880aa0690 100644 --- a/cpp/src/Glacier2Lib/Makefile.mak +++ b/cpp/src/Glacier2Lib/Makefile.mak @@ -43,7 +43,7 @@ SLICE2CPPFLAGS = --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLA $(LIBNAME): $(DLLNAME)
-$(DLLNAME): $(OBJS) Glacier2.res PermissionsVerifierF.cpp RouterF.cpp
+$(DLLNAME): $(OBJS) Glacier2.res $(HDIR)\PermissionsVerifierF.h $(HDIR)\RouterF.h
$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(RES_FILE)
move $(DLLNAME:.dll=.lib) $(LIBNAME)
@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
|