Consistently include Makeconfig after defining subdir.

[thirdparty/glibc.git] / dirent / Makefile

diff --git a/dirent/Makefile b/dirent/Makefile
index 481141136b1be5e9a1427093b45de98f1ddb2162..c9bd5dd62c30b1475574803aba8f675abf55556a 100644 (file)
--- a/dirent/Makefile
+++ b/dirent/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2000, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1991-2014 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -12,23 +12,28 @@
 # Lesser General Public License for more details.
 
 # You should have received a copy of the GNU Lesser General Public
-# License along with the GNU C Library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
+# License along with the GNU C Library; if not, see
+# <http://www.gnu.org/licenses/>.
 
 #
 #      Sub-makefile for dirent portion of the library.
 #
 subdir         := dirent
 
+include ../Makeconfig
+
 headers                := dirent.h bits/dirent.h
 routines       := opendir closedir readdir readdir_r rewinddir \
                   seekdir telldir scandir alphasort versionsort \
                   getdents getdents64 dirfd readdir64 readdir64_r scandir64 \
-                  alphasort64 versionsort64
-distribute := dirstream.h
+                  alphasort64 versionsort64 fdopendir \
+                  scandirat scandirat64
+
+tests     := list tst-seekdir opendir-tst1 bug-readdir1 tst-fdopendir \
+             tst-fdopendir2
 
-tests     := list tst-seekdir opendir-tst1 bug-readdir1
+CFLAGS-scandir.c = $(uses-callbacks)
+CFLAGS-scandir64.c = $(uses-callbacks)
 
 include ../Rules