summaryrefslogtreecommitdiff
path: root/cpp/src/FreezeScript
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2014-08-22 14:38:33 -0230
committerJoe George <joe@zeroc.com>2014-08-22 14:38:33 -0230
commitdaf8d59b70e788b9e34a7894ec6a933b6779e209 (patch)
tree334ad636f545a5ac563ecc284f541689731b37f0 /cpp/src/FreezeScript
parentJS build fixes (diff)
downloadice-daf8d59b70e788b9e34a7894ec6a933b6779e209.tar.bz2
ice-daf8d59b70e788b9e34a7894ec6a933b6779e209.tar.xz
ice-daf8d59b70e788b9e34a7894ec6a933b6779e209.zip
Sort C++ Demo and src makefiles
Diffstat (limited to 'cpp/src/FreezeScript')
-rw-r--r--cpp/src/FreezeScript/Makefile14
-rw-r--r--cpp/src/FreezeScript/Makefile.mak2
2 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile
index 3cc09914229..f2ce096b149 100644
--- a/cpp/src/FreezeScript/Makefile
+++ b/cpp/src/FreezeScript/Makefile
@@ -14,18 +14,18 @@ DUMPDB = $(bindir)/dumpdb
TARGETS = $(TRANSFORMDB) $(DUMPDB)
-COMMON_OBJS = ../FreezeScript/Grammar.o \
- Scanner.o \
- AssignVisitor.o \
+COMMON_OBJS = AssignVisitor.o \
Data.o \
Error.o \
- Functions.o \
Exception.o \
+ Functions.o \
Parser.o \
Print.o \
- Util.o
+ Scanner.o \
+ Util.o \
+ ../FreezeScript/Grammar.o
-TRANSFORM_OBJS = TransformAnalyzer.o \
+TRANSFORM_OBJS = TransformAnalyzer.o \
TransformVisitor.o \
Transformer.o \
transformdb.o
@@ -45,7 +45,7 @@ endif
include $(top_srcdir)/config/Make.rules
-CPPFLAGS := -I.. $(CPPFLAGS) $(DB_FLAGS)
+CPPFLAGS := -I.. $(CPPFLAGS) $(DB_FLAGS)
BISONFLAGS := --name-prefix "freeze_script_" $(BISONFLAGS)
$(TRANSFORMDB): $(TRANSFORM_OBJS) $(COMMON_OBJS)
diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak
index 3b0265270b9..87096a0e33f 100644
--- a/cpp/src/FreezeScript/Makefile.mak
+++ b/cpp/src/FreezeScript/Makefile.mak
@@ -25,7 +25,7 @@ COMMON_OBJS = Grammar.obj \
Print.obj \
Util.obj
-TRANSFORM_OBJS = TransformAnalyzer.obj \
+TRANSFORM_OBJS = TransformAnalyzer.obj \
TransformVisitor.obj \
Transformer.obj \
transformdb.obj