Hello,
Was working on getting dev86 built earlier this afternoon when it became
apparent that due to changes in GNU Make from 3.81 to 3.82, one of the features
which the makefiles for the package relied on had been broken. So, I've fixed
all the makefiles that used the trick (or at least, I think I've fixed them
all.. can someone verify it?) and attached is a patch for GNU Make 3.82 that
results in a working build for at least me.
~DX-MON
diff -Naur dev86-0.16.17.orig/libc/bcc/Makefile dev86-0.16.17/libc/bcc/Makefile
--- dev86-0.16.17.orig/libc/bcc/Makefile 1997-03-08 20:08:17.000000000 +0000
+++ dev86-0.16.17/libc/bcc/Makefile 2011-01-11 15:07:45.000000000 +0000
@@ -52,27 +52,27 @@
all: $(LIBC)
@$(RM) $(OBJ)
-$(LIBC): $(LIBC)($(OBJ))
+$(LIBC): $(OBJ)
-$(LIBC)($(IOBJ)): $(ISRC)
+$(IOBJ): $(ISRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(LOBJ)): $(LSRC)
+$(LOBJ): $(LSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(AOBJ)): $(ASRC)
+$(AOBJ): $(ASRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(ROBJ)): $(RSRC)
+$(ROBJ): $(RSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(POBJ)): $(PSRC)
+$(POBJ): $(PSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
else
all:
@:
diff -Naur dev86-0.16.17.orig/libc/bios/Makefile dev86-0.16.17/libc/bios/Makefile
--- dev86-0.16.17.orig/libc/bios/Makefile 2003-07-31 19:33:02.000000000 +0100
+++ dev86-0.16.17/libc/bios/Makefile 2011-01-11 15:49:09.000000000 +0000
@@ -17,29 +17,33 @@
DSRC=bios_disk.c
DOBJ=bios_disk_rd.o bios_disk_wr.o bios_disk_rs.o bios_get_dpt.o
-OBJ=$(AOBJ) $(BOBJ) $(COBJ) $(DOBJ) \
- time.o fileops.o fs_dos.o rawio.o vt52.o ansi.o
+_OBJ=time.o fileops.o fs_dos.o rawio.o vt52.o ansi.o
+OBJ=$(AOBJ) $(BOBJ) $(COBJ) $(DOBJ) $(_OBJ)
CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS)
-all: $(LIBC)($(OBJ))
+all: $(OBJ)
@$(RM) $(OBJ)
-$(LIBC)($(AOBJ)): $(ASRC)
+$(_OBJ):
+ $(CC) $(CFLAGS) $*.c -c -o $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
+
+$(AOBJ): $(ASRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(BOBJ)): $(BSRC)
+$(BOBJ): $(BSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(COBJ)): $(CSRC)
+$(COBJ): $(CSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(DOBJ)): $(DSRC)
+$(DOBJ): $(DSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
else
all:
@:
diff -Naur dev86-0.16.17.orig/libc/conio/Makefile dev86-0.16.17/libc/conio/Makefile
--- dev86-0.16.17.orig/libc/conio/Makefile 2002-03-16 14:43:36.000000000 +0000
+++ dev86-0.16.17/libc/conio/Makefile 2011-01-11 15:50:37.000000000 +0000
@@ -11,11 +11,11 @@
CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS)
ifeq ($(LIB_CPU)-$(LIB_OS),i86-BIOS)
-all: $(LIBC)($(BIOSOBJ))
+all: $(BIOSOBJ)
@$(RM) $(BIOSOBJ)
else
ifeq ($(LIB_CPU)-$(LIB_OS),i86-DOS)
-all: $(LIBC)($(DOSOBJ))
+all: $(DOSOBJ)
@$(RM) $(DOSOBJ)
else
all:
@@ -23,17 +23,17 @@
endif
endif
-$(LIBC)($(AOBJ)): $(ASRC)
+$(AOBJ): $(ASRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(BOBJ)): $(BSRC)
+$(BOBJ): $(BSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)(cprintf.o): cprintf.c
+cprintf.o: cprintf.c
$(CC) -c -ansi $(ARCH) $(CCFLAGS) $(DEFS) $*.c
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
clean:
rm -f *.o libc.a
diff -Naur dev86-0.16.17.orig/libc/error/Makefile dev86-0.16.17/libc/error/Makefile
--- dev86-0.16.17.orig/libc/error/Makefile 2004-06-21 08:12:31.000000000 +0100
+++ dev86-0.16.17/libc/error/Makefile 2011-01-11 15:15:46.000000000 +0000
@@ -16,13 +16,17 @@
OBJ=__assert.o
endif
-all: $(LIBC)($(OBJ))
+all: $(OBJ)
@$(RM) $(OBJ)
clean:
rm -f *.o libc.a error_list.h
-$(LIBC)(error2.o): error_list.h
+$(OBJ):
+ $(CC) $(CFLAGS) -c -o $*.o $*.c
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
+
+error2.o: error_list.h
error_list.h: liberror.txt
sh mktab.sh
diff -Naur dev86-0.16.17.orig/libc/getent/Makefile dev86-0.16.17/libc/getent/Makefile
--- dev86-0.16.17.orig/libc/getent/Makefile 1997-03-08 20:11:45.000000000 +0000
+++ dev86-0.16.17/libc/getent/Makefile 2011-01-11 15:15:51.000000000 +0000
@@ -21,10 +21,14 @@
OBJ=$(POBJ) $(GOBJ) $(UOBJ)
-all: $(LIBC)($(OBJ))
+all: $(OBJ)
@$(RM) $(OBJ)
-$(LIBC)($(GOBJ)): config-grp.h
+$(OBJ):
+ $(CC) $(CFLAGS) -c -o $*.o $*.c
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
+
+$(GOBJ): config-grp.h
else
all:
diff -Naur dev86-0.16.17.orig/libc/gtermcap/Makefile dev86-0.16.17/libc/gtermcap/Makefile
--- dev86-0.16.17.orig/libc/gtermcap/Makefile 1997-03-08 20:12:00.000000000 +0000
+++ dev86-0.16.17/libc/gtermcap/Makefile 2011-01-11 15:16:57.000000000 +0000
@@ -7,13 +7,17 @@
ifeq ($(LIB_OS),ELKS)
OBJ=termcap.o tparam.o
-all: $(LIBC)($(OBJ))
+all: $(OBJ)
@$(RM) $(OBJ)
else
all:
@:
endif
+$(OBJ):
+ $(CC) $(CFLAGS) -c -o $*.o $*.c
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
+
clean:
rm -f *.o libc.a
diff -Naur dev86-0.16.17.orig/libc/i386sys/Makefile dev86-0.16.17/libc/i386sys/Makefile
--- dev86-0.16.17.orig/libc/i386sys/Makefile 2005-01-03 23:00:39.000000000 +0000
+++ dev86-0.16.17/libc/i386sys/Makefile 2011-01-11 15:55:27.000000000 +0000
@@ -12,12 +12,13 @@
DOBJ=opendir.o closedir.o readdir.o
ifeq ($(LIB_CPU)-$(LIB_OS),i386-ELKS)
-OBJ=$(LOBJ3) $(LOBJ) $(EOBJ) $(DOBJ) setjmp3.o
+_OBJ=setjmp3.o
+OBJ=$(LOBJ3) $(LOBJ) $(EOBJ) $(DOBJ) $(_OBJ)
SYSCALLS=syscalls
CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS)
-all: $(SYSCALLS) $(LIBC)($(OBJ))
+all: $(SYSCALLS) $(OBJ)
@$(RM) $(OBJ)
syscalls: syscall.mak
@@ -26,17 +27,21 @@
syscall.mak: mksyscall syscall.dat
sh mksyscall
-$(LIBC)($(LOBJ)): $(LSRC)
+$(_OBJ):
+ $(CC) $(CFLAGS) $*.c -c -o $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
+
+$(LOBJ): $(LSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(DOBJ)): $(DSRC)
+$(DOBJ): $(DSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(EOBJ)): $(ESRC)
+$(EOBJ): $(ESRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
else
all:
@:
diff -Naur dev86-0.16.17.orig/libc/i386sys/mksyscall dev86-0.16.17/libc/i386sys/mksyscall
--- dev86-0.16.17.orig/libc/i386sys/mksyscall 1997-03-08 20:20:56.000000000 +0000
+++ dev86-0.16.17/libc/i386sys/mksyscall 2011-01-11 16:03:31.000000000 +0000
@@ -131,12 +131,12 @@
CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS)
-all: $(LIBC)($(OBJ))
+all: $(OBJ)
@$(RM) $(OBJ)
-$(LIBC)($(OBJ)): syscall.dat
+$(OBJ): syscall.dat
$(CC) $(CFLAGS) -DL_$* syscall.c -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
!
exit $?
diff -Naur dev86-0.16.17.orig/libc/malloc/Makefile dev86-0.16.17/libc/malloc/Makefile
--- dev86-0.16.17.orig/libc/malloc/Makefile 2003-01-29 19:40:41.000000000 +0000
+++ dev86-0.16.17/libc/malloc/Makefile 2011-01-11 16:10:41.000000000 +0000
@@ -7,12 +7,12 @@
CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS)
-all: $(LIBC)($(AOBJ))
+all: $(AOBJ)
@$(RM) $(OBJ)
-$(LIBC)($(AOBJ)): $(ASRC)
+$(AOBJ): $(ASRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
clean:
rm -f *.o libc.a ../include/malloc.h
diff -Naur dev86-0.16.17.orig/libc/misc/Makefile dev86-0.16.17/libc/misc/Makefile
--- dev86-0.16.17.orig/libc/misc/Makefile 2004-06-20 18:19:42.000000000 +0100
+++ dev86-0.16.17/libc/misc/Makefile 2011-01-11 15:25:43.000000000 +0000
@@ -35,31 +35,39 @@
all: $(LIBC)
@$(RM) $(OBJ)
-$(LIBC): $(LIBC)($(OBJ))
+$(LIBC): $(OBJ)
-$(LIBC)($(MOBJ)): $(MSRC)
+$(GOBJ): $(GSRC)
+ $(CC) $(CFLAGS) $*.c -c -o $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
+
+$(UOBJ): $(USRC)
+ $(CC) $(CFLAGS) $*.c -c -o $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
+
+$(MOBJ): $(MSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(EOBJ)): $(ESRC)
+$(EOBJ): $(ESRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(SOBJ)): $(SSRC)
+$(SOBJ): $(SSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
clean:
rm -f *.o libc.a
-$(LIBC)(strtol.o): strtol.c
+strtol.o: strtol.c
$(CC) -c -ansi $(ARCH) $(CCFLAGS) $(DEFS) $*.c
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)(strtod.o): strtod.c
+strtod.o: strtod.c
$(CC) -c -ansi $(ARCH) $(CCFLAGS) $(DEFS) $*.c
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)(crypt.o): crypt.c
+crypt.o: crypt.c
$(CC) -c -ansi $(ARCH) $(CCFLAGS) $(DEFS) $*.c
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
diff -Naur dev86-0.16.17.orig/libc/msdos/Makefile dev86-0.16.17/libc/msdos/Makefile
--- dev86-0.16.17.orig/libc/msdos/Makefile 1999-03-10 18:03:04.000000000 +0000
+++ dev86-0.16.17/libc/msdos/Makefile 2011-01-11 15:27:13.000000000 +0000
@@ -25,15 +25,15 @@
all: $(LIBC)
@$(RM) $(OBJ)
-$(LIBC): $(LIBC)($(OBJ))
+$(LIBC): $(OBJ)
-$(LIBC)($(AOBJ)): $(ASRC)
+$(AOBJ): $(ASRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(BOBJ)): $(BSRC)
+$(BOBJ): $(BSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
else
all:
@:
diff -Naur dev86-0.16.17.orig/libc/regexp/Makefile dev86-0.16.17/libc/regexp/Makefile
--- dev86-0.16.17.orig/libc/regexp/Makefile 2003-01-29 19:41:07.000000000 +0000
+++ dev86-0.16.17/libc/regexp/Makefile 2011-01-11 15:37:37.000000000 +0000
@@ -7,19 +7,19 @@
all: $(LIBC)
@$(RM) $(OBJ)
-$(LIBC): $(LIBC)($(OBJ))
+$(LIBC): $(OBJ)
transfer:
-...@rm -f ../include/regexp.h ../include/regmagic.h
cp -p regexp.h regmagic.h ../include/.
-$(LIBC)(regexp.o): regexp.c regexp.h regmagic.h
+regexp.o: regexp.c regexp.h regmagic.h
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)(regsub.o): regsub.c regexp.h regmagic.h
+regsub.o: regsub.c regexp.h regmagic.h
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
clean:
rm -f libc.a *.o core mon.out timer.t.h dMakefile dtr try timer
diff -Naur dev86-0.16.17.orig/libc/stdio/Makefile dev86-0.16.17/libc/stdio/Makefile
--- dev86-0.16.17.orig/libc/stdio/Makefile 2005-01-23 13:09:11.000000000 +0000
+++ dev86-0.16.17/libc/stdio/Makefile 2011-01-11 15:38:42.000000000 +0000
@@ -24,19 +24,19 @@
all: $(LIBC)
@$(RM) $(OBJ)
-$(LIBC): $(LIBC)($(OBJ))
+$(LIBC): $(OBJ)
-$(LIBC)($(AOBJ)): $(ASRC)
+$(AOBJ): $(ASRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(POBJ)): $(PSRC)
+$(POBJ): $(PSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(SOBJ)): $(SSRC)
+$(SOBJ): $(SSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
transfer:
-...@rm -f ../include/stdio.h
diff -Naur dev86-0.16.17.orig/libc/string/Makefile dev86-0.16.17/libc/string/Makefile
--- dev86-0.16.17.orig/libc/string/Makefile 2003-01-29 19:41:21.000000000 +0000
+++ dev86-0.16.17/libc/string/Makefile 2011-01-11 15:40:34.000000000 +0000
@@ -7,19 +7,25 @@
strchr.o strrchr.o strdup.o memcpy.o memccpy.o memchr.o memset.o \
memcmp.o memmove.o movedata.o
-OBJ=$(SOBJ) strpbrk.o strsep.o strstr.o strtok.o strcspn.o \
+_OBJ=strpbrk.o strsep.o strstr.o strtok.o strcspn.o \
strspn.o strcasecmp.o strncasecmp.o
+OBJ=$(SOBJ) $(_OBJ)
+
CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS)
all: $(LIBC)
@$(RM) $(OBJ)
-$(LIBC): $(LIBC)($(OBJ))
+$(LIBC): $(OBJ)
+
+$(_OBJ):
+ $(CC) $(CFLAGS) $*.c -c -o $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(SOBJ)): $(SSRC)
+$(SOBJ): $(SSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
transfer:
-...@rm -f ../include/string.h
diff -Naur dev86-0.16.17.orig/libc/syscall/Makefile dev86-0.16.17/libc/syscall/Makefile
--- dev86-0.16.17.orig/libc/syscall/Makefile 1997-10-18 10:57:48.000000000 +0100
+++ dev86-0.16.17/libc/syscall/Makefile 2011-01-11 15:43:16.000000000 +0000
@@ -13,12 +13,14 @@
DOBJ=opendir.o closedir.o readdir.o
ifeq ($(LIB_CPU)-$(LIB_OS),i86-ELKS)
-OBJ=$(LOBJ) $(DOBJ) $(EOBJ) signal.o setjmp.o
+_OBJ=signal.o setjmp.o
+OBJ=$(LOBJ) $(DOBJ) $(EOBJ) $(_OBJ)
SYSCALLS=call_i86
endif
ifeq ($(SYSCALLS),)
-OBJ=setjmp.o
+_OBJ=setjmp.o
+OBJ=$(_OBJ)
endif
CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS)
@@ -35,19 +37,23 @@
syscall.dat:
@touch syscall.dat
-$(LIBC): $(LIBC)($(OBJ))
+$(LIBC): $(OBJ)
-$(LIBC)($(LOBJ)): $(LSRC)
+$(_OBJ):
+ $(CC) $(CFLAGS) $*.c -c -o $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
+
+$(LOBJ): $(LSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(DOBJ)): $(DSRC)
+$(DOBJ): $(DSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
-$(LIBC)($(EOBJ)): $(ESRC)
+$(EOBJ): $(ESRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
clean:
rm -f *.o libc.a
diff -Naur dev86-0.16.17.orig/libc/syscall/mksyscall dev86-0.16.17/libc/syscall/mksyscall
--- dev86-0.16.17.orig/libc/syscall/mksyscall 1997-10-18 10:45:30.000000000 +0100
+++ dev86-0.16.17/libc/syscall/mksyscall 2011-01-11 16:02:09.000000000 +0000
@@ -288,12 +288,12 @@
cat >> syscall.mak <<\!
-all: $(LIBC)($(OBJ))
+all: $(OBJ)
@$(RM) $(OBJ)
-$(LIBC)($(OBJ)): syscall.dat
+$(OBJ): syscall.dat
$(CC) $(CFLAGS) -DL_$* syscall.c -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
!
exit $?
diff -Naur dev86-0.16.17.orig/libc/termios/Makefile dev86-0.16.17/libc/termios/Makefile
--- dev86-0.16.17.orig/libc/termios/Makefile 1997-03-08 20:17:09.000000000 +0000
+++ dev86-0.16.17/libc/termios/Makefile 2011-01-11 15:45:26.000000000 +0000
@@ -8,18 +8,23 @@
cfgetospeed.o cfgetispeed.o cfsetospeed.o cfsetispeed.o cfmakeraw.o
ifeq ($(LIB_OS),ELKS)
-OBJ=$(TOBJ) ttyname.o
+_OBJ=ttyname.o
+OBJ=$(TOBJ) $(_OBJ)
CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS)
all: $(LIBC)
@$(RM) $(OBJ)
-$(LIBC): $(LIBC)($(OBJ))
+$(LIBC): $(OBJ)
-$(LIBC)($(TOBJ)): $(TSRC)
+$(_OBJ):
+ $(CC) $(CFLAGS) $*.c -c -o $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
+
+$(TOBJ): $(TSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(AR) $(ARFLAGS) $@ $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
else
all:
@:
diff -Naur dev86-0.16.17.orig/libc/time/Makefile dev86-0.16.17/libc/time/Makefile
--- dev86-0.16.17.orig/libc/time/Makefile 1997-03-08 20:17:21.000000000 +0000
+++ dev86-0.16.17/libc/time/Makefile 2011-01-11 15:47:07.000000000 +0000
@@ -9,7 +9,11 @@
all: $(LIBC)
@$(RM) $(OBJ)
-$(LIBC): $(LIBC)($(OBJ))
+$(LIBC): $(OBJ)
+
+$(OBJ):
+ $(CC) $(CFLAGS) $*.c -c -o $*.o
+ $(AR) $(ARFLAGS) $(LIBC) $*.o
clean:
rm -f *.o libc.a
_______________________________________________
Clfs-dev mailing list
Clfs-dev@lists.cross-lfs.org
http://lists.cross-lfs.org/listinfo.cgi/clfs-dev-cross-lfs.org
