Corrected make mrproper barfing.
This commit is contained in:
parent
b0306b3425
commit
4fa3c84d99
|
|
@ -1,5 +1,9 @@
|
|||
2004-01-10 Paolo Nenzi <p.nenzi@ieee.org>
|
||||
|
||||
* Fixed makefiles in src/xspice/icm and src/xspice/cmpp to make
|
||||
distclean without barfing. (Stuart Brorson <sdb@cloud9.net>).
|
||||
|
||||
|
||||
* configure.in
|
||||
src/xspice/cmpp/Makefile src/xspice/cmpp/Makefile.in:
|
||||
Make configure automatically set paths for lex yacc and
|
||||
|
|
|
|||
|
|
@ -33,4 +33,19 @@ ifs_lex.c : ifs_lex.l
|
|||
install:
|
||||
|
||||
clean:
|
||||
rm -f $(cmpp_OBJS) $(cmpp_GEN) cmpp
|
||||
rm -f $(cmpp_OBJS) $(cmpp_GEN) cmpp
|
||||
|
||||
# Hack by SDB to enable "make mrproper" from top level.
|
||||
# Since there is no Makefile.am for this directory, we need to
|
||||
# incorporate this stuff by hand.
|
||||
MAINTAINERCLEANFILES = Makefile
|
||||
|
||||
maintainer-clean: maintainer-clean-generic
|
||||
rm -f `find . -type f -name "*~" -print`
|
||||
rm -f `find . -type f -name "*.orig" -print`
|
||||
rm -f `find . -type f -name "*.rej" -print`
|
||||
rm -fR `find . -type d -name ".deps" -print`
|
||||
|
||||
maintainer-clean-generic: clean
|
||||
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||
|
||||
|
|
|
|||
|
|
@ -21,10 +21,10 @@ COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
|
|||
INSTALL_DATA = ${INSTALL} -m 644
|
||||
|
||||
all:
|
||||
@amf=$$2; for x in $(CMDIRS) ; do \
|
||||
@for x in $(CMDIRS) ; do \
|
||||
( cd $$x && $(UPMAKE) $$x-mods ) \
|
||||
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
|
||||
done && test -z "$$fail"
|
||||
|| exit 1; \
|
||||
done
|
||||
|
||||
install: all
|
||||
$(mkinstalldirs) $(DESTDIR)$(libdir)/spice
|
||||
|
|
@ -35,10 +35,10 @@ install: all
|
|||
done
|
||||
|
||||
clean:
|
||||
@amf=$$2; for x in $(CMDIRS) ; do \
|
||||
@for x in $(CMDIRS) ; do \
|
||||
( cd $$x && $(UPMAKE) $$x-mods-clean ) \
|
||||
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
|
||||
done && test -z "$$fail"
|
||||
|| exit 1; \
|
||||
done
|
||||
-rm -rf .deps
|
||||
|
||||
ifspec.c: ifspec.ifs
|
||||
|
|
@ -68,26 +68,26 @@ dlmain.o: cmextrn.h cminfo.h udnextrn.h udninfo.h
|
|||
$(COMPILE) $(LDFLAGS) -o $@ `awk '{ print $$1 }' objects.inc` dlmain.o
|
||||
|
||||
%-mods: modpath.lst udnpath.lst
|
||||
@amf=$$2; for x in `cat modpath.lst` ; do \
|
||||
@for x in `cat modpath.lst` ; do \
|
||||
( cd $$x && $(UPMAKE) objs ) \
|
||||
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
|
||||
done && test -z "$$fail"
|
||||
@amf=$$2; for x in `cat udnpath.lst` ; do \
|
||||
|| exit 1; \
|
||||
done
|
||||
@for x in `cat udnpath.lst` ; do \
|
||||
( cd $$x && $(UPMAKE) uobjs ) \
|
||||
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
|
||||
done && test -z "$$fail"
|
||||
|| exit 1; \
|
||||
done
|
||||
@target=`echo $@ | sed s/-mods//`; $(MAKE) $$target.cm
|
||||
|
||||
%-mods-clean:
|
||||
@target=`echo $@ | sed s/-mods-clean//` && rm -f $$target.cm
|
||||
@amf=$$2; for x in `cat modpath.lst` ; do \
|
||||
@for x in `cat modpath.lst` ; do \
|
||||
( cd $$x && $(UPMAKE) objs-clean ) \
|
||||
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
|
||||
done && test -z "$$fail"
|
||||
@amf=$$2; for x in `cat udnpath.lst` ; do \
|
||||
|| exit 1; \
|
||||
done
|
||||
@for x in `cat udnpath.lst` ; do \
|
||||
( cd $$x && $(UPMAKE) uobjs-clean ) \
|
||||
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
|
||||
done && test -z "$$fail"
|
||||
|| exit 1; \
|
||||
done
|
||||
-rm -f cmextrn.h cminfo.h objects.inc udnextrn.h udninfo.h \
|
||||
dlmain.c dlmain.o
|
||||
-rm -rf .deps
|
||||
|
|
@ -118,3 +118,20 @@ makedefs: $(srcdir)/makedefs.in $(top_builddir)/config.status
|
|||
cd $(top_builddir) \
|
||||
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
# Hack by SDB to enable "make mrproper" from top level.
|
||||
# Since there is no Makefile.am for this directory, we need to
|
||||
# incorporate this stuff by hand.
|
||||
MAINTAINERCLEANFILES =
|
||||
|
||||
maintainer-clean: maintainer-clean-generic
|
||||
rm -f `find . -type f -name "*~" -print`
|
||||
rm -f `find . -type f -name "*.orig" -print`
|
||||
rm -f `find . -type f -name "*.rej" -print`
|
||||
rm -fR `find . -type d -name ".deps" -print`
|
||||
|
||||
maintainer-clean-generic: clean
|
||||
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue