From b25a3800a1da2e1f5874b03d705e094120da6815 Mon Sep 17 00:00:00 2001 From: David Ayers Date: Thu, 19 Feb 2004 13:45:07 +0000 Subject: [PATCH] * EOControl/Makefile.postamble: Remove obsolete dependency and target. Add dependancy and targets for target specific config.h file. * EOAccess/Makefile.preamble: Add include option for target specific config.h file. * EOAdaptors/Postgres95/Makefile.preamble.in: Ditto. * EOModeler/Makefile.preamble: Ditto. * Tools/Makefile.preamble: Ditto. * EOAccess/Makefile.postamble: Comment empty target. * EOControl/EODebug.m (EOFLogC_): Log thread in a portable fashion. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@18628 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 15 +++++++++++++++ EOAccess/Makefile.postamble | 2 +- EOAccess/Makefile.preamble | 2 +- EOAdaptors/Postgres95/Makefile.preamble.in | 5 ++++- EOControl/EODebug.m | 19 ++++++------------- EOControl/Makefile.postamble | 13 ++++++++----- EOModeler/Makefile.preamble | 2 +- Tools/Makefile.preamble | 2 +- 8 files changed, 37 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9816377..40532bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2003-02-19 David Ayers + + * EOControl/Makefile.postamble: Remove obsolete dependency and + target. Add dependancy and targets for target specific config.h + file. + * EOAccess/Makefile.preamble: Add include option for target + specific config.h file. + * EOAdaptors/Postgres95/Makefile.preamble.in: Ditto. + * EOModeler/Makefile.preamble: Ditto. + * Tools/Makefile.preamble: Ditto. + * EOAccess/Makefile.postamble: Comment empty target. + + * EOControl/EODebug.m (EOFLogC_): Log thread in a portable + fashion. + 2003-02-14 Matt Rice * EOAdaptors/Postgres95/Postgres95Channel.m diff --git a/EOAccess/Makefile.postamble b/EOAccess/Makefile.postamble index 0af2e0c..536faef 100644 --- a/EOAccess/Makefile.postamble +++ b/EOAccess/Makefile.postamble @@ -33,7 +33,7 @@ # # Things to do before compiling -before-all:: +# before-all:: # Things to do after compiling # after-all:: diff --git a/EOAccess/Makefile.preamble b/EOAccess/Makefile.preamble index 918ed05..0716962 100644 --- a/EOAccess/Makefile.preamble +++ b/EOAccess/Makefile.preamble @@ -45,7 +45,7 @@ ADDITIONAL_OBJCFLAGS = ADDITIONAL_CFLAGS = # Additional include directories the compiler should search -ADDITIONAL_INCLUDE_DIRS = -I.. +ADDITIONAL_INCLUDE_DIRS = -I../EOControl/$(GNUSTEP_TARGET_DIR) -I.. # Additional LDFLAGS to pass to the linker ADDITIONAL_LDFLAGS = diff --git a/EOAdaptors/Postgres95/Makefile.preamble.in b/EOAdaptors/Postgres95/Makefile.preamble.in index e98f81d..b73c949 100644 --- a/EOAdaptors/Postgres95/Makefile.preamble.in +++ b/EOAdaptors/Postgres95/Makefile.preamble.in @@ -45,7 +45,10 @@ ADDITIONAL_OBJCFLAGS = ADDITIONAL_CFLAGS = # Additional include directories the compiler should search -ADDITIONAL_INCLUDE_DIRS = -I../.. @POSTGRES_INCLUDES@ +ADDITIONAL_INCLUDE_DIRS = \ + -I../../EOControl/$(GNUSTEP_TARGET_DIR) \ + -I../.. \ + @POSTGRES_INCLUDES@ # Libraries linked to the framework LIBRARIES_DEPEND_UPON = @POSTGRES_LIBS@ diff --git a/EOControl/EODebug.m b/EOControl/EODebug.m index 0ddbc84..03895db 100644 --- a/EOControl/EODebug.m +++ b/EOControl/EODebug.m @@ -62,18 +62,9 @@ void EOFLogC_(const char *file, int line, const char *string) if ([NSThread isMultiThreaded]) { - NSThread *t = [NSThread currentThread]; - - fprintf(stderr,"TID="); -#if 0 - if (t && t->_thread_id) - fprintf(stderr,"%p [%ld] (%d) ",(void*)t->_thread_id,(long)t->_thread_id,(int)getpid()); - else -#endif - { - void *tid = (void*)objc_thread_id(); - fprintf(stderr, "%p [%ld] (%d) ", tid, (long)tid, (int)getpid()); - } + fprintf(stderr, "%s PID=(%d) ", + [[GSCurrentThread() description] cString], + (int)getpid()); } fprintf(stderr, "File %s: %d. ", file, line); @@ -82,7 +73,9 @@ void EOFLogC_(const char *file, int line, const char *string) len = strlen(string); if (len <= 0 || string[len-1] != '\n') - fprintf(stderr, "\n"); + { + fprintf(stderr, "\n"); + } fflush(stderr); } diff --git a/EOControl/Makefile.postamble b/EOControl/Makefile.postamble index aad11d6..d7ae97e 100644 --- a/EOControl/Makefile.postamble +++ b/EOControl/Makefile.postamble @@ -33,7 +33,7 @@ # # Things to do before compiling -before-all:: $(GNUSTEP_OBJ_DIR)/exceptions +before-all:: $(GNUSTEP_TARGET_DIR)/config.h # Things to do after compiling # after-all:: @@ -60,7 +60,8 @@ before-all:: $(GNUSTEP_OBJ_DIR)/exceptions # before-distclean:: # Things to do after distcleaning -# after-distclean:: +after-distclean:: + rm -f $(GNUSTEP_TARGET_DIR)/config.h # Things to do before checking # before-check:: @@ -68,7 +69,9 @@ before-all:: $(GNUSTEP_OBJ_DIR)/exceptions # Things to do after checking # after-check: -$(GNUSTEP_OBJ_DIR)/exceptions: - $(MKDIRS) $@ - $(GNUSTEP_OBJ_DIR)/EOModel$(OEXT): EOKeyValueCoding.m EOCustomValues.m + +$(GNUSTEP_TARGET_DIR)/config.h: ../config.status + $(MKDIRS) $(GNUSTEP_TARGET_DIR) + -mv ../config.h $(GNUSTEP_TARGET_DIR) + -touch $(GNUSTEP_TARGET_DIR)/config.h diff --git a/EOModeler/Makefile.preamble b/EOModeler/Makefile.preamble index e350796..945d68b 100644 --- a/EOModeler/Makefile.preamble +++ b/EOModeler/Makefile.preamble @@ -45,7 +45,7 @@ ADDITIONAL_OBJCFLAGS = ADDITIONAL_CFLAGS = # Additional include directories the compiler should search -ADDITIONAL_INCLUDE_DIRS = -I.. +ADDITIONAL_INCLUDE_DIRS = -I../EOControl/$(GNUSTEP_TARGET_DIR) -I.. # Additional LDFLAGS to pass to the linker ADDITIONAL_LDFLAGS = diff --git a/Tools/Makefile.preamble b/Tools/Makefile.preamble index af4187c..b58b7f8 100644 --- a/Tools/Makefile.preamble +++ b/Tools/Makefile.preamble @@ -45,7 +45,7 @@ ADDITIONAL_OBJCFLAGS += -Wall ADDITIONAL_CFLAGS = # Additional include directories the compiler should search -ADDITIONAL_INCLUDE_DIRS = -I.. +ADDITIONAL_INCLUDE_DIRS = -I../EOControl/$(GNUSTEP_TARGET_DIR) -I.. # Additional LDFLAGS to pass to the linker ifneq ($(FOUNDATION_LIB),gnu)