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

diff --git a/gnustep-make/ChangeLog b/gnustep-make/ChangeLog
index f500e1574ab39b8b5efb783197bd82b60ab1a2c7..23c9d50b315d31bf6d38fb9a5887d0f491eb34b9 100644 (file)
--- a/gnustep-make/ChangeLog
+++ b/gnustep-make/ChangeLog
@@ -1,3 +1,15 @@
+2005-08-29  Helge Hess  <helge.hess@skyrix.com>
+       
+       * 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  <helge.hess@opengroupware.org>
 
        * 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 aee8f05c35fd6ddd0538d8531d0687fa974c4f0f..8fb916c540e9d1b9b9c5c7629cd478547331977e 100644 (file)
--- 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 ba375298f3a1e0f3a7193e0ae27f2e1d139b258a..6165c82ea02a0150068ff06d3d21f983ddd0f867 100644 (file)
--- 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 5f46597fb7d291b61666ea7aed89e950883bcb3c..9e4a1b756460d47dce5d5370d6867e4f2250f39b 100644 (file)
--- 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;
              }