From 24e8f0ec75bc5ac8a809c31fd553ff5e8eff5dc0 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 3 Jan 2002 09:39:11 +0000
Subject: Make getopt act the same regardless whether the app was staticly
 linked or dynamicly linked.  Obeys the principle of least surprise.  -Erik

---
 libc/unistd/Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'libc/unistd/Makefile')

diff --git a/libc/unistd/Makefile b/libc/unistd/Makefile
index 12f3f6f2e..be002c64c 100644
--- a/libc/unistd/Makefile
+++ b/libc/unistd/Makefile
@@ -25,8 +25,8 @@ TOPDIR=../../
 include $(TOPDIR)Rules.mak
 DIRS:=
 
-CSRC=execl.c execlp.c execv.c execvep.c execvp.c execle.c getcwd.c getopt.c \
-	sleep.c usleep.c getpass.c sysconf_src.c getopt_vars.c getlogin.c \
+CSRC=execl.c execlp.c execv.c execvep.c execvp.c execle.c getcwd.c \
+	sleep.c usleep.c getpass.c sysconf_src.c getlogin.c \
 	fpathconf.c confstr.c pathconf.c
 ifeq ($(strip $(HAS_MMU)),true)
     CSRC+=daemon.c
@@ -41,11 +41,9 @@ endif
 
 COBJS=$(patsubst %.c,%.o, $(CSRC))
 
-MSRC=gnu_getopt.c
+MSRC=getopt.c
 MOBJ=_gnu_getopt_internal.o gnu_getopt_long.o gnu_getopt_long_only.o
 
-# WARNING! MOBJ _must_ come after COBJS for link to pick getopt 
-# over gnu_getopt when appropriate.
 OBJS=$(COBJS) $(MOBJ)
 
 all: $(SYSCONF) $(OBJS) $(LIBC)
-- 
cgit v1.2.3