From ae97a89e1a1a9833080dccc81f6cd26784e1b964 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 11 Jan 2001 11:42:17 +0000
Subject: A large update from Manuel Novoa III <mnovoa3@bellsouth.net>.

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

(limited to 'libc/unistd/Makefile')

diff --git a/libc/unistd/Makefile b/libc/unistd/Makefile
index faebda604..c1ff28575 100644
--- a/libc/unistd/Makefile
+++ b/libc/unistd/Makefile
@@ -28,8 +28,13 @@ LIBC=$(TOPDIR)libc.a
 CSRC=execl.c execlp.c execv.c execvep.c execvp.c getcwd.c getopt.c \
 	sleep.c sysconf.c getpass.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
-OBJS=$(COBJS)
 
+MSRC=gnu_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: $(OBJS) $(LIBC)
 
@@ -38,8 +43,12 @@ $(LIBC): ar-target subdirs
 ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
 
-$(COBJS):
-	$(CC) $(CFLAGS) $< -c $*.c -o $*.o
+$(COBJS): %.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+	$(STRIPTOOL) -x -R .note -R .comment $*.o
+
+$(MOBJ): $(MSRC)
+	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(OBJ): Makefile
-- 
cgit v1.2.3