shithub: scc

Info  •  Files  •  Log  •  Branches

Don't run make dep in configure

The result of make dep can depend of the state of the build
process, so it is better to remove from configure because it
can generate spureous changes.

--- a/configure

+++ b/configure

@@ -17,6 +17,6 @@

 fi

 echo Generating arch-dependant build files...

-make dep > /dev/null

+cd inc && make config > /dev/null

 echo You can now install scc with \"make install\"

--- a/driver/posix/Makefile

+++ b/driver/posix/Makefile

@@ -31,8 +31,10 @@

 	chmod +x $$$$.sh && \

 	mv $$$$.sh $@

-dep:

+config.h:

 	PREFIX=$(PREFIX) USEQBE=$(USEQBE) ./config.sh $(SYSLST)

+

+dep:

 	$(PROJECTDIR)/mkdep.sh

 clean:

--- a/inc/Makefile

+++ b/inc/Makefile

@@ -6,9 +6,9 @@

 HDR = ldflags.h syscrts.h sysincludes.h syslibs.h

-all:

+all: config

-dep: $(HDR)

+config: $(HDR)

 ldflags.h:

 	rm -f $@ ; \

@@ -34,6 +34,5 @@

 	sed 's,PREFIX,"$(PREFIX)",g' < syslibs.def.h > $$$$.h && \

 	mv $$$$.h $@

-clean:

 distclean:

 	rm -f $(HDR)

--- a/rules.mk

+++ b/rules.mk

@@ -1,8 +1,8 @@

 include $(PROJECTDIR)/config.mk

 BINDIR  = $(PROJECTDIR)/rootdir/bin

-INCDIR  = $(PROJECTDIR)/inc/

-LIBEXEC = $(PROJECTDIR)/rootdir/libexec/scc/

+INCDIR  = $(PROJECTDIR)/inc

+LIBEXEC = $(PROJECTDIR)/rootdir/libexec/scc

 LIBSCC  = $(PROJECTDIR)/lib/scc

 SCC_CFLAGS = $(MOREFLAGS) \

@@ -33,4 +33,5 @@

 all:

 dep:

+clean:

 distclean: clean