Move the lock and tls source files into a subdirectory.

diff --git a/ChangeLog b/ChangeLog
index eb10d66e43dd67c4484be084fd7dac698a81a185..d4be462ff4d354baceb0dbb6d718bd87761775de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2008-08-14  Bruno Haible  <bruno@clisp.org>
+
+       * lib/glthread/lock.h: Renamed from lib/lock.h.
+       * lib/glthread/lock.c: Renamed from lib/lock.c. Update includes.
+       * lib/glthread/tls.h: Renamed from lib/tls.h.
+       * lib/glthread/tls.c: Renamed from lib/tls.c. Update includes.
+       * lib/fstrcmp.c: Update includes.
+       * lib/strsignal.c: Update includes.
+       * modules/lock (Files, Makefile.am): Update.
+       (Include): Change to "glthread/lock.h".
+       * modules/tls (Files, Makefile.am): Update.
+       (Include): Change to "glthread/tls.h".
+       * tests/test-lock.c: Update includes.
+       * tests/test-tls.c: Update includes.
+       * NEWS: Mention the renamed header files.
+
 2008-08-11  Jim Meyering  <meyering@redhat.com>
 
        * lib/fts_.h: Fix grammar (insert a missing "is") in a comment.

diff --git a/NEWS b/NEWS
index da75d7f83d7282381fc462ebbfde0566ec3b4d9b..b5b08a60fddf7c3487474718d75c39df97973442 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,11 @@ User visible incompatible changes
 
 Date        Modules         Changes
 
+2008-08-14  lock            The include file is changed from "lock.h"
+                            to "glthread/lock.h".
+            tls             The include file is changed from "tls.h"
+                            to "glthread/tls.h".
+
 2008-07-17  c-stack         The module now requires the addition of
                             $(LIBCSTACK) or $(LTLIBCSTACK) in Makefile.am,
                             since it may depend on linking with libsigsegv.

diff --git a/lib/fstrcmp.c b/lib/fstrcmp.c
index f0e51e7276d1ccf8cfa3d8a78323fe3b1ff27944..70e68185d750d4f89c1ebe73947129cbcf98f3fa 100644 (file)
--- a/lib/fstrcmp.c
+++ b/lib/fstrcmp.c
@@ -1,5 +1,6 @@
 /* Functions to make fuzzy comparisons between strings
-   Copyright (C) 1988-1989, 1992-1993, 1995, 2001-2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988-1989, 1992-1993, 1995, 2001-2003, 2006, 2008
+   Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -50,8 +51,8 @@
 #include <stdlib.h>
 #include <limits.h>
 
-#include "lock.h"
-#include "tls.h"
+#include "glthread/lock.h"
+#include "glthread/tls.h"
 #include "minmax.h"
 #include "xalloc.h"
 

diff --git a/lib/lock.c b/lib/glthread/lock.c
similarity index 99%
rename from lib/lock.c
rename to lib/glthread/lock.c
index 4d97fa4abc12386b9e6332329143eb147261cbca..ac3a0d809eb8d165d59082611192d41bc1e0233a 100644 (file)
--- a/lib/lock.c
+++ b/lib/glthread/lock.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include "lock.h"
+#include "glthread/lock.h"
 
 /* ========================================================================= */
 

diff --git a/lib/lock.h b/lib/glthread/lock.h
similarity index 100%
rename from lib/lock.h
rename to lib/glthread/lock.h

diff --git a/lib/tls.c b/lib/glthread/tls.c
similarity index 98%
rename from lib/tls.c
rename to lib/glthread/tls.c
index e857f611b12d41c3da6a7cf0fcbaf51fcaae27bd..46832fe6601688f3883374137c133bfbd6888167 100644 (file)
--- a/lib/tls.c
+++ b/lib/glthread/tls.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#include "tls.h"
+#include "glthread/tls.h"
 
 /* ========================================================================= */
 

diff --git a/lib/tls.h b/lib/glthread/tls.h
similarity index 100%
rename from lib/tls.h
rename to lib/glthread/tls.h

diff --git a/lib/strsignal.c b/lib/strsignal.c
index 2e76bb8969133d9332d08bcd89cb76a80c415d20..a7adaba956037635326ee4c383619ce51fc820b7 100644 (file)
--- a/lib/strsignal.c
+++ b/lib/strsignal.c
@@ -36,8 +36,8 @@
 #ifdef _LIBC
 # include <bits/libc-lock.h>
 #else /* !_LIBC */
-# include "lock.h"
-# include "tls.h"
+# include "glthread/lock.h"
+# include "glthread/tls.h"
 # define __libc_once_define(CLASS, NAME) gl_once_define (CLASS, NAME)
 # define __libc_once(NAME, INIT) gl_once ((NAME), (INIT))
 # define __libc_key_t gl_tls_key_t

diff --git a/modules/lock b/modules/lock
index 9e203c2a93d6f8f9936b5a169437e875a0516391..6f18a61de2526ee3894dfdf60d15013c2fe4a476 100644 (file)
--- a/modules/lock
+++ b/modules/lock
@@ -2,8 +2,8 @@ Description:
 Locking in multithreaded situations.
 
 Files:
-lib/lock.h
-lib/lock.c
+lib/glthread/lock.h
+lib/glthread/lock.c
 m4/lock.m4
 build-aux/config.rpath
 
@@ -17,10 +17,10 @@ configure.ac:
 gl_LOCK
 
 Makefile.am:
-lib_SOURCES += lock.h lock.c
+lib_SOURCES += glthread/lock.h glthread/lock.c
 
 Include:
-"lock.h"
+"glthread/lock.h"
 
 Link:
 $(LTLIBTHREAD) when linking with libtool, $(LIBTHREAD) otherwise

diff --git a/modules/tls b/modules/tls
index 00a81cc1e243fb42ddd48a5828e750464dcc8727..8c325d9718386b8bdf42ab6813ecb3c0fa4373b5 100644 (file)
--- a/modules/tls
+++ b/modules/tls
@@ -2,8 +2,8 @@ Description:
 Thread-local storage in multithreaded situations.
 
 Files:
-lib/tls.h
-lib/tls.c
+lib/glthread/tls.h
+lib/glthread/tls.c
 m4/tls.m4
 
 Depends-on:
@@ -13,10 +13,10 @@ configure.ac:
 gl_TLS
 
 Makefile.am:
-lib_SOURCES += tls.h tls.c
+lib_SOURCES += glthread/tls.h glthread/tls.c
 
 Include:
-"tls.h"
+"glthread/tls.h"
 
 License:
 LGPLv2+

diff --git a/tests/test-lock.c b/tests/test-lock.c
index 2d10833c26f62fb2359ecab7ff9c121ba6ff161b..6d2278e04b416621c83ca0d31d650f5d4a3a80ec 100644 (file)
--- a/tests/test-lock.c
+++ b/tests/test-lock.c
@@ -1,5 +1,5 @@
 /* Test of locking in multithreaded situations.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -71,7 +71,7 @@
 # undef USE_PTH_THREADS
 # undef USE_WIN32_THREADS
 #endif
-#include "lock.h"
+#include "glthread/lock.h"
 
 #if ENABLE_DEBUGGING
 # define dbgprintf printf

diff --git a/tests/test-tls.c b/tests/test-tls.c
index 89107752affc0531b880dd537d34fdb641cbd45a..83c4ffb1659b8f1c5cdc963cf5d5ce0b9eceecf8 100644 (file)
--- a/tests/test-tls.c
+++ b/tests/test-tls.c
@@ -1,5 +1,5 @@
 /* Test of thread-local storage in multithreaded situations.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "tls.h"
+#include "glthread/tls.h"
 
 #if ENABLE_DEBUGGING
 # define dbgprintf printf