X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=mk%2Ftarget.mk;h=3011f21eb032b0ca96e4b503b41e8f072c8dc321;hb=b84f982a5c1b2008fd872629aae9ec9b650e4d74;hp=a89f1b06ccbca8907d562854909774386b94a425;hpb=9ededbc805d53f9a7a41ffe872cd2b0f81687a8a;p=ghc-hetmet.git diff --git a/mk/target.mk b/mk/target.mk index a89f1b0..3011f21 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -69,7 +69,7 @@ ifneq "$(DOC_SRCS)" "" $(MKDEPENDLIT) -o .depend $(MKDEPENDLIT_OPTS) $(filter %.lit,$(DOC_SRCS)) endif ifneq "$(MKDEPENDC_SRCS)" "" - $(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) -- $(CC_OPTS) -- $(MKDEPENDC_SRCS) + $(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(MKDEPENDC_SRCS) endif ifneq "$(MKDEPENDHS_SRCS)" "" $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-optdep-o -optdep$(obj)) $(MKDEPENDHS_OPTS) $(patsubst -odir,,$(HC_OPTS)) $(MKDEPENDHS_SRCS) @@ -324,6 +324,23 @@ endef endif # $(filter... endif +# +# Remove local symbols from library objects if requested. +# + +ifeq "$(StripLibraries)" "YES" +ifneq "$(filter -split-objs,$(HC_OPTS))" "" +SRC_HC_POST_OPTS += \ + for i in $(basename $@)/*; do \ + ld -r -x -o $$i.tmp $$i; \ + $(MV) $$i.tmp $$i; \ + done +else +SRC_HC_POST_OPTS += \ + ld -r -x -o $@.tmp $@; $(MV) $@.tmp $@ +endif +endif + $(LIBRARY) :: $(LIBOBJS) $(BUILD_LIB) endif @@ -413,11 +430,26 @@ endif ifneq "$(SCRIPT_LINK)" "" all :: $(SCRIPT_LINK) +# +# Don't want to overwrite $(SCRIPT_LINK)s that aren't symbolic +# links. Testing for symbol links is problematic to do in +# a portable fashion using a /bin/sh test, so we simply rely +# on perl. +# $(SCRIPT_LINK) : $(SCRIPT_PROG) - $(LN_S) $(SCRIPT_PROG) $(SCRIPT_LINK) + @if ( $(PERL) -e '$$fn="$(SCRIPT_LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \ + echo "Creating a symbol link from $(SCRIPT_PROG) to $(SCRIPT_LINK)"; \ + $(RM) $(SCRIPT_LINK); \ + $(LN_S) $(SCRIPT_PROG) $(SCRIPT_LINK); \ + else \ + echo "Creating a symbol link from $(SCRIPT_PROG) to $(SCRIPT_LINK) failed: \`$(SCRIPT_LINK)' already exists"; \ + echo "Perhaps remove \`$(SCRIPT_LINK)' manually?"; \ + exit 1; \ + fi; endif + ########################################### # # Targets: install install-strip uninstall @@ -466,8 +498,9 @@ install-dirs :: ifneq "$(INSTALL_PROGS)" "" install:: $(INSTALL_PROGS) @$(INSTALL_DIR) $(bindir) - for i in $(INSTALL_PROGS); do \ - $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i$(exeext) $(bindir); \ + @for i in $(INSTALL_PROGS); do \ + echo $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i$(exeext) $(bindir); \ + $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i$(exeext) $(bindir); \ done endif @@ -596,30 +629,30 @@ endif # Use with care.. # uninstall:: -ifeq ($(INSTALL_PROGS),) - @for i in $(INSTALL_PROGS) ; do \ + @for i in $(INSTALL_PROGS) "" ; do \ + if test "$$i"; then \ echo rm -f $(bindir)/`basename $$i`; \ rm -f $(bindir)/`basename $$i`; \ + fi; \ done -endif -ifeq ($(INSTALL_LIBS),) - @for i in $(INSTALL_LIBS); do \ + @for i in $(INSTALL_LIBS) ""; do \ + if test "$$i"; then \ echo rm -f $(libdir)/`basename $$i`; \ rm -f $(libdir)/`basename $$i`; \ + fi; \ done -endif -ifeq ($(INSTALL_LIBEXECS),) - @for i in $(INSTALL_LIBEXECS); do \ + @for i in $(INSTALL_LIBEXECS) ""; do \ + if test "$$i"; then \ echo rm -f $(libexecdir)/`basename $$i`; \ rm -f $(libexecdir)/`basename $$i`; \ + fi; \ done -endif -ifeq ($(INSTALL_DATAS),) - @for i in $(INSTALL_DATAS); do \ + @for i in $(INSTALL_DATAS) ""; do \ + if test "$$i"; then \ echo rm -f $(datadir)/`basename $$i`; \ rm -f $(datadir)/`basename $$i`; \ + fi; \ done -endif # # install-strip is from the GNU Makefile standard. @@ -634,7 +667,16 @@ endif # ifneq "$(SCRIPT_LINK)" "" install :: - $(LN_S) $(SCRIPT_PROG) $(bindir)/$(SCRIPT_LINK) + @if ( $(PERL) -e '$$fn="$(bindir)/$(SCRIPT_LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \ + echo "Creating a symbol link from $(SCRIPT_PROG) to $(SCRIPT_LINK) in $(bindir)"; \ + $(RM) $(bindir)/$(SCRIPT_LINK); \ + $(LN_S) $(SCRIPT_PROG) $(bindir)/$(SCRIPT_LINK); \ + else \ + echo "Creating a symbol link from $(SCRIPT_PROG) to $(SCRIPT_LINK) in $(bindir) failed: \`$(bindir)/$(SCRIPT_LINK)' already exists"; \ + echo "Perhaps remove \`$(bindir)/$(SCRIPT_LINK)' manually?"; \ + exit 1; \ + fi; + endif ########################################### @@ -708,9 +750,14 @@ dist-post:: dist-manifest :: cd $(SRC_DIST_DIR); find . \( -type l -o -type f \) -exec ls -lLG {} \; | sed -e 's/\.\///' > /tmp/MANIFEST ; mv /tmp/MANIFEST MANIFEST -dist-package:: +dist-package:: dist-package-tar-gz + +dist-package-tar-gz :: cd $(SRC_DIST_DIR); cd ..; $(TAR) chzf $(SRC_DIST_NAME).tar.gz $(SRC_DIST_NAME) +dist-package-zip :: + cd $(SRC_DIST_DIR); cd ..; $(ZIP) $(ZIP_OPTS) -r $(SRC_DIST_NAME).zip $(SRC_DIST_NAME) + # # binary-dist creates a binary bundle, set BIN_DIST_NAME # to package name and do `make binary-dist' (normally this @@ -818,32 +865,25 @@ ifneq "$(SGML_DOC)" "" # multi-file SGML document: main document name is specified in $(SGML_DOC), # sub-documents (.sgml files) listed in $(SGML_SRCS). -$(SGML_DOC).sgml : $(SGML_SRCS) - cat $(SGML_SRCS) > $(SGML_DOC).sgml - -SGML_DVI = $(SGML_DOC).dvi -SGML_PS = $(SGML_DOC).ps -SGML_INFO = $(SGML_DOC).info -SGML_HTML = $(SGML_DOC).html -SGML_TEXT = $(SGML_DOC).txt - -else # no SGML_DOC - +ifeq "$(VSGML_SRCS)" "" VSGML_SRCS = $(wildcard *.vsgml) +endif +ifeq "$(SGML_SRCS)" "" ifneq "$(VSGML_SRCS)" "" -SGML_SRCS = $(addsuffix .sgml, $(basename $(VSGML_SRCS))) +SGML_SRCS = $(patsubst %.vsgml, %.sgml, $(VSGML_SRCS)) else -SGML_SRCS = $(wildcard *.sgml) +SGML_SRCS = $(wildcard *.sgml) +endif endif -SGML_DVI = $(addsuffix .dvi, $(basename $(SGML_SRCS))) -SGML_PS = $(addsuffix .ps, $(basename $(SGML_SRCS))) -SGML_INFO = $(addsuffix .info, $(basename $(SGML_SRCS))) -SGML_HTML = $(addsuffix .html, $(basename $(SGML_SRCS))) -SGML_TEXT = $(addsuffix .txt, $(basename $(SGML_SRCS))) +SGML_DVI = $(SGML_DOC).dvi +SGML_PS = $(SGML_DOC).ps +SGML_INFO = $(SGML_DOC).info +SGML_HTML = $(SGML_DOC).html +SGML_TEXT = $(SGML_DOC).txt -endif # SGML_DOC +$(SGML_DVI) $(SGML_PS) $(SGML_INFO) $(SGML_HTML) $(SGML_TEXT) :: $(SGML_SRCS) dvi :: $(SGML_DVI) info :: $(SGML_INFO) @@ -851,7 +891,9 @@ html :: $(SGML_HTML) txt :: $(SGML_TXT) ps :: $(SGML_PS) -CLEAN_FILES += $(SGML_TEXT) $(SGML_HTML) $(SGML_PS) $(SGML_DVI) +CLEAN_FILES += $(SGML_TEXT) $(SGML_DOC)*.html $(SGML_PS) $(SGML_DVI) + +endif ########################################### # @@ -899,7 +941,7 @@ ifneq "$(HS_OBJS)" "" ifneq "$(filter -split-objs,$(HC_OPTS))" "" clean :: find $(patsubst %.$(way_)o,%,$(HS_OBJS)) -name '*.$(way_)o' -print | xargs $(RM) __rm_food - -rmdir $(patsubst %.$(way_)o,%,$(HS_OBJS)) + -rmdir $(patsubst %.$(way_)o,%,$(HS_OBJS)) > /dev/null 2>&1 endif endif