update makefiles

git-svn-id: https://svn.code.sf.net/p/openv2g/code/trunk@79 d9f2db14-54d0-4bde-b00c-16405c910529

Release/makefile

@@ -8,13 +8,13 @@ RM := rm -rf
 
 # All of the sources participating in the build are defined here
 -include sources.mk
--include subdir.mk
 -include src/transport/subdir.mk
 -include src/test/subdir.mk
 -include src/service/subdir.mk
 -include src/codec/appHandCodec/subdir.mk
 -include src/codec/subdir.mk
 -include src/appHandshake/subdir.mk
+-include subdir.mk
 -include objects.mk
 
 ifneq ($(MAKECMDGOALS),clean)
@@ -34,7 +34,7 @@ all: OpenV2G.exe
 OpenV2G.exe: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: MinGW C Linker'
-	gcc  -o"OpenV2G.exe" $(OBJS) $(USER_OBJS) $(LIBS)
+	gcc  -o "OpenV2G.exe" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

Release/objects.mk

@@ -5,3 +5,4 @@
 USER_OBJS :=
 
 LIBS :=
+

Release/src/appHandshake/subdir.mk

@@ -5,17 +5,17 @@
 # Add inputs and outputs from these tool invocations to the build variables 
 C_SRCS += \
 ../src/appHandshake/appHand_DataDeserialization.c \
-../src/appHandshake/appHand_DataSerialization.c \
+../src/appHandshake/appHand_dataSerialization.c \
 ../src/appHandshake/appHand_dataTypes.c 
 
 OBJS += \
 ./src/appHandshake/appHand_DataDeserialization.o \
-./src/appHandshake/appHand_DataSerialization.o \
+./src/appHandshake/appHand_dataSerialization.o \
 ./src/appHandshake/appHand_dataTypes.o 
 
 C_DEPS += \
 ./src/appHandshake/appHand_DataDeserialization.d \
-./src/appHandshake/appHand_DataSerialization.d \
+./src/appHandshake/appHand_dataSerialization.d \
 ./src/appHandshake/appHand_dataTypes.d 
 
 
@@ -23,7 +23,7 @@ C_DEPS += \
 src/appHandshake/%.o: ../src/appHandshake/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\codec" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\codec\appHandCodec" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\appHandshake" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\transport" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\service" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\test" -O3 -Os -pedantic -pedantic-errors -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	gcc -I"../src/codec" -I"../src/codec/appHandCodec" -I"../src/appHandshake" -I"../src/transport" -I"../src/service" -I"../src/test" -O3 -Os -g3 -pedantic -pedantic-errors -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

Release/src/codec/appHandCodec/subdir.mk

@@ -4,26 +4,32 @@
 
 # Add inputs and outputs from these tool invocations to the build variables 
 C_SRCS += \
-../src/codec/appHandCodec/appHand_EXIDecoder.c \
-../src/codec/appHandCodec/appHand_EXIEncoder.c \
-../src/codec/appHandCodec/appHand_NameTableEntries.c 
+../src/codec/appHandCodec/appHandEXICoder.c \
+../src/codec/appHandCodec/appHandEXIDecoder.c \
+../src/codec/appHandCodec/appHandEXIEncoder.c \
+../src/codec/appHandCodec/appHandNameTableEntries.c \
+../src/codec/appHandCodec/appHandQNames.c 
 
 OBJS += \
-./src/codec/appHandCodec/appHand_EXIDecoder.o \
-./src/codec/appHandCodec/appHand_EXIEncoder.o \
-./src/codec/appHandCodec/appHand_NameTableEntries.o 
+./src/codec/appHandCodec/appHandEXICoder.o \
+./src/codec/appHandCodec/appHandEXIDecoder.o \
+./src/codec/appHandCodec/appHandEXIEncoder.o \
+./src/codec/appHandCodec/appHandNameTableEntries.o \
+./src/codec/appHandCodec/appHandQNames.o 
 
 C_DEPS += \
-./src/codec/appHandCodec/appHand_EXIDecoder.d \
-./src/codec/appHandCodec/appHand_EXIEncoder.d \
-./src/codec/appHandCodec/appHand_NameTableEntries.d 
+./src/codec/appHandCodec/appHandEXICoder.d \
+./src/codec/appHandCodec/appHandEXIDecoder.d \
+./src/codec/appHandCodec/appHandEXIEncoder.d \
+./src/codec/appHandCodec/appHandNameTableEntries.d \
+./src/codec/appHandCodec/appHandQNames.d 
 
 
 # Each subdirectory must supply rules for building sources it contributes
 src/codec/appHandCodec/%.o: ../src/codec/appHandCodec/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\codec" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\codec\appHandCodec" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\appHandshake" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\transport" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\service" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\test" -O3 -Os -pedantic -pedantic-errors -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	gcc -I"../src/codec" -I"../src/codec/appHandCodec" -I"../src/appHandshake" -I"../src/transport" -I"../src/service" -I"../src/test" -O3 -Os -g3 -pedantic -pedantic-errors -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

Release/src/codec/subdir.mk

@@ -20,6 +20,7 @@ C_SRCS += \
 ../src/codec/EXIHeaderEncoder.c \
 ../src/codec/MethodsBag.c \
 ../src/codec/NameTableEntries.c \
+../src/codec/QNames.c \
 ../src/codec/StringTable.c \
 ../src/codec/UCSString.c 
 
@@ -40,6 +41,7 @@ OBJS += \
 ./src/codec/EXIHeaderEncoder.o \
 ./src/codec/MethodsBag.o \
 ./src/codec/NameTableEntries.o \
+./src/codec/QNames.o \
 ./src/codec/StringTable.o \
 ./src/codec/UCSString.o 
 
@@ -60,6 +62,7 @@ C_DEPS += \
 ./src/codec/EXIHeaderEncoder.d \
 ./src/codec/MethodsBag.d \
 ./src/codec/NameTableEntries.d \
+./src/codec/QNames.d \
 ./src/codec/StringTable.d \
 ./src/codec/UCSString.d 
 
@@ -68,7 +71,7 @@ C_DEPS += \
 src/codec/%.o: ../src/codec/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\codec" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\codec\appHandCodec" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\appHandshake" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\transport" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\service" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\test" -O3 -Os -pedantic -pedantic-errors -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	gcc -I"../src/codec" -I"../src/codec/appHandCodec" -I"../src/appHandshake" -I"../src/transport" -I"../src/service" -I"../src/test" -O3 -Os -g3 -pedantic -pedantic-errors -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

Release/src/service/subdir.mk

@@ -4,21 +4,21 @@
 
 # Add inputs and outputs from these tool invocations to the build variables 
 C_SRCS += \
+../src/service/v2g_dataTypes.c \
 ../src/service/v2g_serviceClientStubs.c \
 ../src/service/v2g_serviceDataSerialization.c \
-../src/service/v2g_serviceDataTypes.c \
 ../src/service/v2g_serviceDispatcher.c 
 
 OBJS += \
+./src/service/v2g_dataTypes.o \
 ./src/service/v2g_serviceClientStubs.o \
 ./src/service/v2g_serviceDataSerialization.o \
-./src/service/v2g_serviceDataTypes.o \
 ./src/service/v2g_serviceDispatcher.o 
 
 C_DEPS += \
+./src/service/v2g_dataTypes.d \
 ./src/service/v2g_serviceClientStubs.d \
 ./src/service/v2g_serviceDataSerialization.d \
-./src/service/v2g_serviceDataTypes.d \
 ./src/service/v2g_serviceDispatcher.d 
 
 
@@ -26,7 +26,7 @@ C_DEPS += \
 src/service/%.o: ../src/service/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\codec" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\codec\appHandCodec" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\appHandshake" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\transport" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\service" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\test" -O3 -Os -pedantic -pedantic-errors -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	gcc -I"../src/codec" -I"../src/codec/appHandCodec" -I"../src/appHandshake" -I"../src/transport" -I"../src/service" -I"../src/test" -O3 -Os -g3 -pedantic -pedantic-errors -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

Release/src/test/subdir.mk

@@ -32,7 +32,7 @@ C_DEPS += \
 src/test/%.o: ../src/test/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\codec" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\codec\appHandCodec" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\appHandshake" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\transport" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\service" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\test" -O3 -Os -pedantic -pedantic-errors -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	gcc -I"../src/codec" -I"../src/codec/appHandCodec" -I"../src/appHandshake" -I"../src/transport" -I"../src/service" -I"../src/test" -O3 -Os -g3 -pedantic -pedantic-errors -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

Release/src/transport/subdir.mk

@@ -17,7 +17,7 @@ C_DEPS += \
 src/transport/%.o: ../src/transport/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\codec" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\codec\appHandCodec" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\appHandshake" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\transport" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\service" -I"D:\Data\MCHN4240\workspace_c\OpenV2G\trunk\src\test" -O3 -Os -pedantic -pedantic-errors -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	gcc -I"../src/codec" -I"../src/codec/appHandCodec" -I"../src/appHandshake" -I"../src/transport" -I"../src/service" -I"../src/test" -O3 -Os -g3 -pedantic -pedantic-errors -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '