diff --git a/ChangeLog b/ChangeLog index b8973cd..e87f9e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-03-12 Matt Rice + + * EOInterface/Makefile.preamble, + * EOInterface/GNUmakefile, + * EOAccess/Makefile.preamble, + * EOAdaptors/PostgreSQLAdaptor/Makefile.preamble, + * EOControl/Makefile.preamble, + * common.make, + * EOModeler/Makefile.preamble: Add gcov flags. + + 2008-03-11 Matt Rice * EOAccess/EOModel.m (-addEntity:): Reword assertion message. diff --git a/EOAccess/Makefile.preamble b/EOAccess/Makefile.preamble index 3f67fd6..922e915 100644 --- a/EOAccess/Makefile.preamble +++ b/EOAccess/Makefile.preamble @@ -40,16 +40,16 @@ ADDITIONAL_CPPFLAGS = $(FND_DEFINE) $(RUNTIME_DEFINE) -g # Additional flags to pass to the Objective-C compiler -ADDITIONAL_OBJCFLAGS = +ADDITIONAL_OBJCFLAGS = $(TEST_CFLAGS) # Additional flags to pass to the C compiler -ADDITIONAL_CFLAGS = +ADDITIONAL_CFLAGS = $(TEST_CFLAGS) # Additional include directories the compiler should search ADDITIONAL_INCLUDE_DIRS = -I../EOControl/$(GNUSTEP_TARGET_DIR) -I.. # Additional LDFLAGS to pass to the linker -ADDITIONAL_LDFLAGS = +ADDITIONAL_LDFLAGS = $(TEST_LDFLAGS) # Additional library directories the linker should search ADDITIONAL_LIB_DIRS = @@ -73,6 +73,8 @@ ifneq ($(FOUNDATION_LIB),gnu) LIBRARIES_DEPEND_UPON += -lgnustep-baseadd endif +LIBRARIES_DEPEND_UPON += $(TEST_COVERAGE_LIBS) + ADDITIONAL_NATIVE_LIBS += EOControl ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl diff --git a/EOAdaptors/PostgreSQLAdaptor/Makefile.preamble b/EOAdaptors/PostgreSQLAdaptor/Makefile.preamble index 0f32487..27a12b1 100644 --- a/EOAdaptors/PostgreSQLAdaptor/Makefile.preamble +++ b/EOAdaptors/PostgreSQLAdaptor/Makefile.preamble @@ -40,10 +40,12 @@ ADDITIONAL_CPPFLAGS += # Additional flags to pass to the Objective-C compiler -ADDITIONAL_OBJCFLAGS += +ADDITIONAL_OBJCFLAGS += $(TEST_CFLAGS) # Additional flags to pass to the C compiler -ADDITIONAL_CFLAGS += +ADDITIONAL_CFLAGS += $(TEST_CFLAGS) + +ADDITIONAL_LDFLAGS += $(TEST_LDFLAGS) # Additional include directories the compiler should search ADDITIONAL_INCLUDE_DIRS += \ @@ -57,6 +59,8 @@ ifneq ($(FOUNDATION_LIB),gnu) LIBRARIES_DEPEND_UPON += -lgnustep-baseadd endif +LIBRARIES_DEPEND_UPON += $(TEST_COVERAGE_LIBS) + # # Flags dealing with installing and uninstalling # diff --git a/EOControl/Makefile.preamble b/EOControl/Makefile.preamble index 72c93d0..673b98b 100644 --- a/EOControl/Makefile.preamble +++ b/EOControl/Makefile.preamble @@ -40,16 +40,16 @@ ADDITIONAL_CPPFLAGS = $(FND_DEFINE) $(RUNTIME_DEFINE) -g # Additional flags to pass to the Objective-C compiler -ADDITIONAL_OBJCFLAGS = +ADDITIONAL_OBJCFLAGS = $(TEST_CFLAGS) # Additional flags to pass to the C compiler -ADDITIONAL_CFLAGS = +ADDITIONAL_CFLAGS = $(TEST_CFLAGS) # Additional include directories the compiler should search ADDITIONAL_INCLUDE_DIRS = -I./$(GNUSTEP_TARGET_DIR) -I.. # Additional LDFLAGS to pass to the linker -ADDITIONAL_LDFLAGS = +ADDITIONAL_LDFLAGS = $(TEST_LDFLAGS) # Additional library directories the linker should search ADDITIONAL_LIB_DIRS = @@ -73,6 +73,8 @@ ifneq ($(FOUNDATION_LIB),gnu) LIBRARIES_DEPEND_UPON += -lgnustep-baseadd endif +LIBRARIES_DEPEND_UPON += $(TEST_COVERAGE_LIBS) + ifeq ($(FOUNDATION_HAS_KVC), yes) ADDITIONAL_OBJCFLAGS := $(ADDITIONAL_OBJCFLAGS) -DFOUNDATION_HAS_KVC=1 endif diff --git a/EOInterface/GNUmakefile b/EOInterface/GNUmakefile index 5b844dd..7852253 100644 --- a/EOInterface/GNUmakefile +++ b/EOInterface/GNUmakefile @@ -96,6 +96,7 @@ EOInterface_AGSDOC_FLAGS = \ -include Makefile.preamble -include GNUmakefile.local +-include ../GNUmakefile.local include $(GNUSTEP_MAKEFILES)/native-library.make # Only build the doc if doc=yes was passed on the command line diff --git a/EOInterface/Makefile.preamble b/EOInterface/Makefile.preamble index 1dcf3e4..c9fc348 100644 --- a/EOInterface/Makefile.preamble +++ b/EOInterface/Makefile.preamble @@ -31,16 +31,16 @@ ADDITIONAL_CPPFLAGS = $(FND_DEFINE) $(RUNTIME_DEFINE) -g # Additional flags to pass to the Objective-C compiler -ADDITIONAL_OBJCFLAGS = +ADDITIONAL_OBJCFLAGS = $(TEST_CFLAGS) # Additional flags to pass to the C compiler -ADDITIONAL_CFLAGS = +ADDITIONAL_CFLAGS = $(TEST_CFLAGS) # Additional include directories the compiler should search ADDITIONAL_INCLUDE_DIRS = -I../EOControl/$(GNUSTEP_TARGET_DIR) -I.. # Additional LDFLAGS to pass to the linker -ADDITIONAL_LDFLAGS = +ADDITIONAL_LDFLAGS = $(TEST_LDFLAGS) # Additional library directories the linker should search ADDITIONAL_LIB_DIRS = @@ -64,6 +64,8 @@ ifneq ($(FOUNDATION_LIB),gnu) LIBRARIES_DEPEND_UPON += -lgnustep-baseadd endif +LIBRARIES_DEPEND_UPON += $(TEST_COVERAGE_LIBS) + ADDITIONAL_NATIVE_LIB_DIRS += ../EOControl ../EOAccess ADDITIONAL_NATIVE_LIBS += EOControl EOAccess diff --git a/EOModeler/Makefile.preamble b/EOModeler/Makefile.preamble index 453462c..657f66e 100644 --- a/EOModeler/Makefile.preamble +++ b/EOModeler/Makefile.preamble @@ -39,16 +39,16 @@ ADDITIONAL_CPPFLAGS = $(FND_DEFINE) $(RUNTIME_DEFINE) # Additional flags to pass to the Objective-C compiler -ADDITIONAL_OBJCFLAGS = +ADDITIONAL_OBJCFLAGS = $(TEST_CFLAGS) # Additional flags to pass to the C compiler -ADDITIONAL_CFLAGS = +ADDITIONAL_CFLAGS = $(TEST_CFLAGS) # Additional include directories the compiler should search ADDITIONAL_INCLUDE_DIRS = -I../EOControl/$(GNUSTEP_TARGET_DIR) -I.. # Additional LDFLAGS to pass to the linker -ADDITIONAL_LDFLAGS = +ADDITIONAL_LDFLAGS = $(TEST_LDFLAGS) # Additional library directories the linker should search ADDITIONAL_LIB_DIRS= @@ -72,6 +72,8 @@ ifneq ($(FOUNDATION_LIB),gnu) LIBRARIES_DEPEND_UPON += -lgnustep-baseadd endif +LIBRARIES_DEPEND_UPON += $(TEST_COVERAGE_LIBS) + ADDITIONAL_NATIVE_LIB_DIRS += ../EOAccess ../EOControl ADDITIONAL_NATIVE_LIBS += EOControl EOAccess diff --git a/common.make b/common.make index 4e781cf..638fef0 100644 --- a/common.make +++ b/common.make @@ -6,3 +6,10 @@ GDL2_AGSDOC_FLAGS = \ GDL2ACCESS_EXPORT = extern; \ GDL2INTERFACE_EXPORT = extern; \ }' + +ifeq ($(gcov),yes) +TEST_CFLAGS +=-ftest-coverage -fprofile-arcs +TEST_LDFLAGS +=-ftest-coverage -fprofile-arcs -lgcov +TEST_COVERAGE_LIBS+=-lgcov +endif +