From e6175885a30a43790d2994f7128bf13ee0464cca Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 29 Aug 2005 10:38:33 +0000 Subject: [PATCH] fixed some gcc4 warnings in which_lib some PCH cleanup fixed HEADER_FILES_DIR git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1094 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- gnustep-make/ChangeLog | 12 ++++++++++++ gnustep-make/Instance/Shared/headers.make | 6 ++---- gnustep-make/Instance/Shared/pch.make | 6 ++---- gnustep-make/which_lib.c | 6 +++--- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/gnustep-make/ChangeLog b/gnustep-make/ChangeLog index f500e157..23c9d50b 100644 --- a/gnustep-make/ChangeLog +++ b/gnustep-make/ChangeLog @@ -1,3 +1,15 @@ +2005-08-29 Helge Hess + + * Instance/Shared/headers.make: fixed HEADER_FILES_INSTALL_DIR not to + include HEADER_FILES_DIR + + * Instance/Shared/headers.make (.PHONY): removed all/clean targets (now + in pch.make) + + * Instance/Shared/pch.make: removed PCH debug logs + + * which_lib.c: fixed gcc4 warnings + 2005-08-26 Helge Hess * configure.ac: replaced gcc-version check with a --enable-pch option diff --git a/gnustep-make/Instance/Shared/headers.make b/gnustep-make/Instance/Shared/headers.make index aee8f05c..8fb916c5 100644 --- a/gnustep-make/Instance/Shared/headers.make +++ b/gnustep-make/Instance/Shared/headers.make @@ -43,9 +43,7 @@ HEADER_FILES = $($(GNUSTEP_INSTANCE)_HEADER_FILES) .PHONY: \ shared-instance-headers-install \ -shared-instance-headers-uninstall \ -shared-instance-headers-all \ -shared-instance-headers-clean +shared-instance-headers-uninstall # We always compute HEADER_FILES_DIR and HEADER_FILES_INSTALL_DIR. # The reason is that frameworks might have headers in subprojects (and @@ -61,7 +59,7 @@ ifeq ($(HEADER_FILES_DIR),) HEADER_FILES_DIR = . endif -HEADER_FILES_INSTALL_DIR = $(HEADER_FILES_DIR)/$($(GNUSTEP_INSTANCE)_HEADER_FILES_INSTALL_DIR) +HEADER_FILES_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_HEADER_FILES_INSTALL_DIR) # Please use `.' to force it to stay empty ifeq ($(HEADER_FILES_INSTALL_DIR),) diff --git a/gnustep-make/Instance/Shared/pch.make b/gnustep-make/Instance/Shared/pch.make index ba375298..6165c82e 100644 --- a/gnustep-make/Instance/Shared/pch.make +++ b/gnustep-make/Instance/Shared/pch.make @@ -57,8 +57,7 @@ shared-instance-pch-clean: else # no PCH file defined -shared-instance-pch-all: - @(echo "No PCH file declared: $(GNUSTEP_INSTANCE)_PCH_FILE" ) +shared-instance-pch-all: #@(echo "No PCH file: $(GNUSTEP_INSTANCE)_PCH_FILE" ) shared-instance-pch-clean: @@ -66,8 +65,7 @@ endif else # no PCH in compiler -shared-instance-pch-all: - @(echo "No PCH support in compiler." ) +shared-instance-pch-all: #@(echo "No PCH support in compiler." ) shared-instance-pch-clean: diff --git a/gnustep-make/which_lib.c b/gnustep-make/which_lib.c index 5f46597f..9e4a1b75 100644 --- a/gnustep-make/which_lib.c +++ b/gnustep-make/which_lib.c @@ -173,7 +173,7 @@ static void stripstr (unsigned char *s) return; } - len = strlen (s); + len = strlen ((char *)s); while (len > 0) { @@ -246,7 +246,7 @@ static char *normalize_and_check_dir (char *path) return NULL; } - stripstr (normalized_path); + stripstr ((unsigned char *)normalized_path); return normalized_path; } @@ -712,7 +712,7 @@ int main (int argc, char** argv) } all_libraries[libraries_no] = malloc (strlen (argv[i]) - 1); strcpy (all_libraries[libraries_no], argv[i] + 2); - stripstr (all_libraries[libraries_no]); + stripstr ((unsigned char *)all_libraries[libraries_no]); libraries_no++; continue; } -- 2.39.5