X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=612f58b2321ecad54e4dc46d62882efe75e29a9f;hb=67fe852eb2e9b3a489b62cbf9259b5a868db5468;hp=86b85cb5617ceec0a50af174c639bfc75948607e;hpb=2494295a158b44eebf3d6fc55cae04955a4e25f4;p=ghc-hetmet.git diff --git a/mk/target.mk b/mk/target.mk index 86b85cb..612f58b 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) @@ -346,6 +346,26 @@ $(LIBRARY) :: $(LIBOBJS) endif #---------------------------------------- +# Building Win32 DLLs +# +ifeq "$(way)" "dll" + +ifeq "$(DLL_NAME)" "" +DLL_NAME = $(patsubst %.a, %.dll, $(subst lib,,$(LIBRARY))) +endif + +all :: $(DLL_NAME) + +ifeq "$(DLL_IMPLIB_NAME)" "" +DLL_IMPLIB_NAME = $(patsubst %.a, %_imp.a, $(LIBRARY)) +endif + +$(DLL_NAME) :: $(LIBRARY) + $(BLD_DLL) --output-lib $(DLL_IMPLIB_NAME) -o $(DLL_NAME) $(LIBRARY) $(BLD_DLL_OPTS) + touch dLL_ifs.hi +endif + +#---------------------------------------- # Script programs ifneq "$(SCRIPT_PROG)" "" @@ -432,17 +452,17 @@ 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 +# links. Testing for symbolic links is problematic to do in # a portable fashion using a /bin/sh test, so we simply rely # on perl. # $(SCRIPT_LINK) : $(SCRIPT_PROG) @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)"; \ + echo "Creating a symbolic 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 "Creating a symbolic link from $(SCRIPT_PROG) to $(SCRIPT_LINK) failed: \`$(SCRIPT_LINK)' already exists"; \ echo "Perhaps remove \`$(SCRIPT_LINK)' manually?"; \ exit 1; \ fi; @@ -459,11 +479,12 @@ endif # For each of these variables that is defined, you # get one install rule # -# INSTALL_PROGS executable programs in $(bindir) -# INSTALL_SCRIPTS executable scripts in $(bindir) -# INSTALL_LIBS platform-dependent libraries in $(libdir) (ranlib'ed) -# INSTALL_LIBEXECS platform-dependent execs in $(libdir) -# INSTALL_DATAS platform-independent files in $(datadir) +# INSTALL_PROGS executable programs in $(bindir) +# INSTALL_SCRIPTS executable scripts in $(bindir) +# INSTALL_LIBS platform-dependent libraries in $(libdir) (ranlib'ed) +# INSTALL_LIB_SCRIPTS platform-dependent scripts in $(libdir) +# INSTALL_LIBEXECS platform-dependent execs in $(libdir) +# INSTALL_DATAS platform-independent files in $(datadir) # # If the installation directory variable is undefined, the install rule simply # emits a suitable error message. @@ -499,8 +520,14 @@ ifneq "$(INSTALL_PROGS)" "" install:: $(INSTALL_PROGS) @$(INSTALL_DIR) $(bindir) @for i in $(INSTALL_PROGS); do \ - echo $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i$(exeext) $(bindir); \ - $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i$(exeext) $(bindir); \ + case $$i in \ + *.dll) \ + echo $(INSTALL_DATA) $(INSTALL_BIN_OPTS) $$i $(bindir); \ + $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(bindir) ;; \ + *) \ + echo $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i$(exeext) $(bindir); \ + $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i$(exeext) $(bindir) ;; \ + esac; \ done endif @@ -511,89 +538,26 @@ endif ifneq "$(INSTALL_SCRIPTS)" "" install:: $(INSTALL_SCRIPTS) @$(INSTALL_DIR) $(bindir) -ifeq "$(INTERP)" "perl" -ifneq "$(BIN_DIST)" "1" - @for i in $(INSTALL_SCRIPTS); do \ - $(RM) $$i.tmp; \ - echo "#! $(PERL)" > $$i.tmp ; \ - echo '$$'"bindir='$(bindir)';" >> $$i.tmp ; \ - echo '$$'"libdir='$(libdir)';" >> $$i.tmp ; \ - echo '$$'"libexecdir='$(libexecdir)';" >> $$i.tmp ; \ - echo '$$'"datadir='$(datadir)';" >> $$i.tmp ; \ - cat $$i >> $$i.tmp ; \ - echo $(INSTALL_PROGRAM) $(filter-out -s,$(INSTALL_BIN_OPTS)) $$i.tmp $(bindir)/$$i ; \ - $(INSTALL_PROGRAM) $(filter-out -s,$(INSTALL_BIN_OPTS)) $$i.tmp $(bindir)/$$i ; \ - $(RM) $$i.tmp; \ - done -else - for i in $(INSTALL_SCRIPTS); do \ - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(bindir); \ - done -endif -else for i in $(INSTALL_SCRIPTS); do \ - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(bindir); \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(bindir); \ done endif -endif ifneq "$(INSTALL_LIB_SCRIPTS)" "" install:: $(INSTALL_LIB_SCRIPTS) @$(INSTALL_DIR) $(libdir) -ifeq "$(INTERP)" "perl" -ifneq "$(BIN_DIST)" "1" - @for i in $(INSTALL_LIB_SCRIPTS); do \ - $(RM) $$i.tmp; \ - echo "#! $(PERL)" > $$i.tmp ; \ - echo '$$'"bindir='$(bindir)';" >> $$i.tmp ; \ - echo '$$'"libdir='$(libdir)';" >> $$i.tmp ; \ - echo '$$'"libexecdir='$(libexecdir)';" >> $$i.tmp ; \ - echo '$$'"datadir='$(datadir)';" >> $$i.tmp ; \ - cat $$i >> $$i.tmp ; \ - echo $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libdir) ; \ - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i.tmp $(libdir)/$$i ; \ - $(RM) $$i.tmp; \ - done -else - for i in $(INSTALL_LIB_SCRIPTS); do \ - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libdir); \ - done -endif -else for i in $(INSTALL_LIB_SCRIPTS); do \ - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libdir); \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libdir); \ done endif -endif ifneq "$(INSTALL_LIBEXEC_SCRIPTS)" "" install:: $(INSTALL_LIBEXEC_SCRIPTS) @$(INSTALL_DIR) $(libexecdir) -ifeq "$(INTERP)" "perl" -ifneq "$(BIN_DIST)" "1" - @for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ - $(RM) $$i.tmp; \ - echo "#! $(PERL)" > $$i.tmp ; \ - echo '$$'"bindir='$(bindir)';" >> $$i.tmp ; \ - echo '$$'"libdir='$(libdir)';" >> $$i.tmp ; \ - echo '$$'"libexecdir='$(libexecdir)';" >> $$i.tmp ; \ - echo '$$'"datadir='$(datadir)';" >> $$i.tmp ; \ - cat $$i >> $$i.tmp ; \ - echo $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libexecdir) ; \ - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i.tmp $(libexecdir)/$$i ; \ - $(RM) $$i.tmp; \ - done -else - for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libexecdir); \ - done -endif -else for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libexecdir); \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libexecdir); \ done endif -endif ifneq "$(INSTALL_LIBS)" "" install:: $(INSTALL_LIBS) @@ -603,6 +567,8 @@ install:: $(INSTALL_LIBS) *.a) \ $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(libdir); \ $(RANLIB) $(libdir)/`basename $$i` ;; \ + *.dll) \ + $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i $(libdir) ;; \ *) \ $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(libdir); \ esac; \ @@ -758,59 +724,6 @@ dist-package-tar-gz :: 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 -# just a thing you would do from the toplevel of fptools or) -# from the top of a project. -# -.PHONY: binary-dist-pre binary-dist binary-pack - -binary-dist-pre:: - -rm -rf $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) - -rm -f $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz - @for i in $(BIN_DIST_DIRS); do \ - if test -d "$$i"; then \ - echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion); \ - $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion); \ - echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion); \ - $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion); \ - echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$(ProjectNameShort)-$(ProjectVersion); \ - $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$(ProjectNameShort)-$(ProjectVersion); \ - echo $(MAKE) -C $$i $(MFLAGS) install BIN_DIST=1 BIN_DIST_NAME=$(BIN_DIST_NAME) \ - prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ - exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ - bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \ - libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \ - libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \ - datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$(ProjectNameShort)-$(ProjectVersion) ; \ - $(MAKE) -C $$i $(MFLAGS) install BIN_DIST=1 BIN_DIST_NAME=$(BIN_DIST_NAME) \ - prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ - exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ - bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \ - libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \ - libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \ - datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$(ProjectNameShort)-$(ProjectVersion) ; \ - fi; \ - done - -# -# Do this separately for now -# -binary-pack:: - ( cd $(BIN_DIST_TMPDIR); $(TAR) chzf $(BIN_DIST_NAME).tar.gz $(BIN_DIST_NAME); rm -rf $(BIN_DIST_NAME) ) - -ifneq "$(way)" "" -package-way-dist:: - ( cd $(BIN_DIST_TMPDIR); find $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print | xargs tar cvf $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar ) - gzip $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar -endif - -ifneq "$(way)" "" -remove-way-dist:: - ( cd $(BIN_DIST_TMPDIR); find $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print -exec rm -f {} \; ) -endif - ########################################### # # Targets: check tags show info @@ -865,32 +778,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) @@ -898,7 +804,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 ########################################### # @@ -1051,7 +959,6 @@ endif # if way # its tracks should any of the sub-makes fail. By my reckoning, # "cmd || exit $?" should be equivalent to "cmd" -ifeq "$(way)" "" ifneq "$(SUBDIRS)" "" all docs runtests boot TAGS clean veryclean maintainer-clean install info :: @@ -1083,7 +990,6 @@ dist :: if [ $$? -eq 0 ] ; then true; else exit $$x_on_err; fi; \ done endif -endif # The default dist rule: #