[hydra-commits] hydra/ice branch, slice-translator-versioning, updated.
Commits to the Hydra project code repositories
hydra-commits at lists.digium.com
Fri Jun 25 17:09:02 CDT 2010
branch "slice-translator-versioning" has been updated
via e4dcbfb5d5168ad4e4d9b72d652627fb8d736dda (commit)
from 952641d09f4c5a53f931c6680368d86dd07f6ef1 (commit)
Summary of changes:
cpp/test/Ice/versioning/version1/Makefile | 3 +++
cpp/test/Ice/versioning/version2/Makefile | 2 ++
2 files changed, 5 insertions(+), 0 deletions(-)
- Log -----------------------------------------------------------------
commit e4dcbfb5d5168ad4e4d9b72d652627fb8d736dda
Author: Brent Eagles <beagles at digium.com>
Date: Fri Jun 25 19:37:04 2010 -0230
Makefile fix.
diff --git a/cpp/test/Ice/versioning/version1/Makefile b/cpp/test/Ice/versioning/version1/Makefile
index aa840bb..d2992a2 100644
--- a/cpp/test/Ice/versioning/version1/Makefile
+++ b/cpp/test/Ice/versioning/version1/Makefile
@@ -18,7 +18,9 @@ VOBJS = Client.o \
Test.o
include $(top_srcdir)/config/Make.rules
+
CPPFLAGS := -DVERSION1 -I. -I.. -I../../../include $(CPPFLAGS)
+
SLICE2CPPFLAGS := $(SLICE2CPPFLAGS) -DVERSION1 --suppress
Client.o: ../Client.cpp Test.cpp
@@ -33,6 +35,7 @@ Test.o: Test.cpp Test.h
Test.cpp Test.h: ../Test.ice
rm -f $@
$(SLICE2CPP) $(SLICE2CPPFLAGS) $^
+
$(CLIENT): $(VOBJS)
rm -f $@
diff --git a/cpp/test/Ice/versioning/version2/Makefile b/cpp/test/Ice/versioning/version2/Makefile
index e9338c5..e0fdc10 100644
--- a/cpp/test/Ice/versioning/version2/Makefile
+++ b/cpp/test/Ice/versioning/version2/Makefile
@@ -19,7 +19,9 @@ VOBJS = Client.o \
include $(top_srcdir)/config/Make.rules
+
CPPFLAGS := -DVERSION2 -I. -I.. -I../../../include $(CPPFLAGS)
+
SLICE2CPPFLAGS := $(SLICE2CPPFLAGS) -DVERSION2 --suppress
Client.o: ../Client.cpp Test.cpp
-----------------------------------------------------------------------
--
hydra/ice
More information about the asterisk-scf-commits
mailing list