diff -urN indent-2.2.4/Makefile indent-2.2.4-eo/Makefile --- indent-2.2.4/Makefile Mon Jul 7 21:24:14 2003 +++ indent-2.2.4-eo/Makefile Mon Jul 7 21:16:35 2003 @@ -11,6 +11,15 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +ROOT = $(HOME)/EOTA/eota/kernel +NEWLIB = $(HOME)/EOTA/libc/newlib-1.8.1/eota/newlib +LIBS = $(NEWLIB)/crt0.o $(NEWLIB)/libc.a +KERNLIBS = $(ROOT)/POSIX/libc/libnative.a +STARTADDR = 0x00001000 +ENTRY = _start +CFLAGS = -g -O2 -Wall -I. -I$(NEWLIB)/targ-include \ + -I$(NEWLIB)/libc/include -DEOTA +LDFLAGS = -s -Bstatic -e ${ENTRY} -Ttext=$(STARTADDR) SHELL = /bin/sh @@ -85,7 +94,7 @@ MAINTAINERCLEANFILES = aclocal.m4 Makefile.in config.h.in stamp-h.in configure ChangeLog texinfo2man indent.1 gperf.c gperf-cc.c indent-1.spec index.html cvslog-*.html indent.html indent_*.html #CFLAGS = -g -CFLAGS = -g -O2 +## CFLAGS = -g -O2 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h @@ -95,8 +104,8 @@ DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I. CPPFLAGS = -LDFLAGS = -LIBS = +## LDFLAGS = +## LIBS = indent_OBJECTS = args.o comments.o indent.o lexi.o parse.o backup.o \ globs.o io.o indent_LDADD = $(LDADD) @@ -104,7 +113,8 @@ indent_LDFLAGS = COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +## LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +LINK = $(LD) $(LDFLAGS) -o $@ TEXI2DVI = texi2dvi INFO_DEPS = indent.info DVIS = indent.dvi @@ -222,7 +232,7 @@ indent: $(indent_OBJECTS) $(indent_DEPENDENCIES) @rm -f indent - $(LINK) $(indent_LDFLAGS) $(indent_OBJECTS) $(indent_LDADD) $(LIBS) + $(LINK) $(indent_LDFLAGS) $(indent_OBJECTS) $(indent_LDADD) $(LIBS) $(KERNLIBS) $(srcdir)/version.texi: #stamp-vti @: