Don't build empty objects, remove unused vars, update copyright

7 files changed, 36 insertions, 47 deletions

diff --git a/libc/stdio/Makefile.in b/libc/stdio/Makefile.in
index dfdf4ff14..3a6f739b4 100644
--- a/libc/stdio/Makefile.in
+++ b/libc/stdio/Makefile.in
@@ -17,8 +17,9 @@ CSRC := \
 	asprintf.c sprintf.c vasprintf.c vdprintf.c vsnprintf.c \
 	tmpfile.c tmpnam.c tmpnam_r.c popen.c tempnam.c ctermid.c
 
-# Note: The *64.o objects are empty when compiled without large file support
+ifeq ($(UCLIBC_HAS_LFS),y)
 CSRC += fgetpos64.c fopen64.c freopen64.c fseeko64.c fsetpos64.c ftello64.c
+endif
 
 # getc -> alias for fgetc
 # putc -> alias for fputc
@@ -110,9 +111,9 @@ STDIO_MOBJ := $(STDIO_MOBJ1) $(STDIO_MOBJ2)
 
 STDIO_DEF := $(patsubst %,-DL_%,$(subst .o,,$(filter-out $(STDIO_MOBJ_NO_MULTI),$(notdir $(STDIO_MOBJ)))))
 
-STDIO_OBJS := $(STDIO_OBJ) $(STDIO_MOBJ) $(STDIO_CUOBJ) $(STDIO_CLOBJ)
+STDIO_OBJS := $(STDIO_OBJ) $(STDIO_MOBJ) $(STDIO_CUOBJ)
 
-STDIO_NO_MULTI := $(STDIO_CUOBJ) $(STDIO_CLOBJ)
+STDIO_NO_MULTI := $(STDIO_CUOBJ)
 
 # these need special handling or rewrite to support multi-build
 # CUOBJ
diff --git a/libc/stdio/fgetpos64.c b/libc/stdio/fgetpos64.c
index d222a1a98..f86c332f1 100644
--- a/libc/stdio/fgetpos64.c
+++ b/libc/stdio/fgetpos64.c
@@ -1,16 +1,14 @@
 /* Copyright (C) 2004       Manuel Novoa III    <mjn3@codepoet.org>
  *
- * GNU Library General Public License (LGPL) version 2 or later.
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  *
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
 #include "_stdio.h"
 
-#ifdef __UCLIBC_HAS_LFS__
-# define __DO_LARGEFILE
-# define fgetpos	fgetpos64
-# define fpos_t		fpos64_t
-# define ftell		ftello64
-# include "fgetpos.c"
-#endif
+#define __DO_LARGEFILE
+#define fgetpos	fgetpos64
+#define fpos_t		fpos64_t
+#define ftell		ftello64
+#include "fgetpos.c"
diff --git a/libc/stdio/fopen64.c b/libc/stdio/fopen64.c
index 7ac73dc8c..64ba30501 100644
--- a/libc/stdio/fopen64.c
+++ b/libc/stdio/fopen64.c
@@ -1,15 +1,13 @@
 /* Copyright (C) 2004       Manuel Novoa III    <mjn3@codepoet.org>
  *
- * GNU Library General Public License (LGPL) version 2 or later.
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  *
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
 #include "_stdio.h"
 
-#ifdef __UCLIBC_HAS_LFS__
-# define __DO_LARGEFILE
-# define fopen         fopen64
-# define FILEDES_ARG   (-2)
-# include "fopen.c"
-#endif
+#define __DO_LARGEFILE
+#define fopen         fopen64
+#define FILEDES_ARG   (-2)
+#include "fopen.c"
diff --git a/libc/stdio/freopen64.c b/libc/stdio/freopen64.c
index d5cd41b24..e44c972f1 100644
--- a/libc/stdio/freopen64.c
+++ b/libc/stdio/freopen64.c
@@ -1,15 +1,13 @@
 /* Copyright (C) 2004       Manuel Novoa III    <mjn3@codepoet.org>
  *
- * GNU Library General Public License (LGPL) version 2 or later.
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  *
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
 #include "_stdio.h"
 
-#ifdef __UCLIBC_HAS_LFS__
-# define __DO_LARGEFILE
-# define freopen       freopen64
-# define FILEDES_ARG   (-2)
-# include "freopen.c"
-#endif
+#define __DO_LARGEFILE
+#define freopen       freopen64
+#define FILEDES_ARG   (-2)
+#include "freopen.c"
diff --git a/libc/stdio/fseeko64.c b/libc/stdio/fseeko64.c
index e4ffe94ed..5bc4ae34e 100644
--- a/libc/stdio/fseeko64.c
+++ b/libc/stdio/fseeko64.c
@@ -1,15 +1,13 @@
 /* Copyright (C) 2004       Manuel Novoa III    <mjn3@codepoet.org>
  *
- * GNU Library General Public License (LGPL) version 2 or later.
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  *
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
 #include "_stdio.h"
 
-#ifdef __UCLIBC_HAS_LFS__
-# define __DO_LARGEFILE
-# define FSEEK         __fseeko64
-# define OFFSET_TYPE   __off64_t
-# include "fseeko.c"
-#endif
+#define __DO_LARGEFILE
+#define FSEEK         __fseeko64
+#define OFFSET_TYPE   __off64_t
+#include "fseeko.c"
diff --git a/libc/stdio/fsetpos64.c b/libc/stdio/fsetpos64.c
index faae7a5b0..b46571e9c 100644
--- a/libc/stdio/fsetpos64.c
+++ b/libc/stdio/fsetpos64.c
@@ -1,16 +1,14 @@
 /* Copyright (C) 2004       Manuel Novoa III    <mjn3@codepoet.org>
  *
- * GNU Library General Public License (LGPL) version 2 or later.
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  *
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
 #include "_stdio.h"
 
-#ifdef __UCLIBC_HAS_LFS__
-# define __DO_LARGEFILE
-# define fsetpos	fsetpos64
-# define fpos_t		fpos64_t
-# define fseek		fseeko64
-# include "fsetpos.c"
-#endif
+#define __DO_LARGEFILE
+#define fsetpos	fsetpos64
+#define fpos_t		fpos64_t
+#define fseek		fseeko64
+#include "fsetpos.c"
diff --git a/libc/stdio/ftello64.c b/libc/stdio/ftello64.c
index f87c4caad..32a37d368 100644
--- a/libc/stdio/ftello64.c
+++ b/libc/stdio/ftello64.c
@@ -1,15 +1,13 @@
 /* Copyright (C) 2004       Manuel Novoa III    <mjn3@codepoet.org>
  *
- * GNU Library General Public License (LGPL) version 2 or later.
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  *
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
 #include "_stdio.h"
 
-#ifdef __UCLIBC_HAS_LFS__
-# define __DO_LARGEFILE
-# define FTELL         __ftello64
-# define OFFSET_TYPE   __off64_t
-# include "ftello.c"
-#endif
+#define __DO_LARGEFILE
+#define FTELL         __ftello64
+#define OFFSET_TYPE   __off64_t
+#include "ftello.c"