diff options
Diffstat (limited to 'lib/ftp')
| -rw-r--r-- | lib/ftp/Makefile | 40 | ||||
| -rw-r--r-- | lib/ftp/doc/src/Makefile | 102 | ||||
| -rw-r--r-- | lib/ftp/doc/src/ftp.xml | 2 | ||||
| -rw-r--r-- | lib/ftp/test/Makefile | 2 | ||||
| -rw-r--r-- | lib/ftp/test/ftp_bench.spec | 1 |
5 files changed, 7 insertions, 140 deletions
diff --git a/lib/ftp/Makefile b/lib/ftp/Makefile index e0c9de42e4..a26d1de0a0 100644 --- a/lib/ftp/Makefile +++ b/lib/ftp/Makefile @@ -32,47 +32,11 @@ VSN = $(FTP_VSN) SPECIAL_TARGETS = -DIA_PLT = ./priv/plt/$(APPLICATION).plt -DIA_ANALYSIS = $(basename $(DIA_PLT)).dialyzer_analysis - - # ---------------------------------------------------- # Default Subdir Targets # ---------------------------------------------------- include $(ERL_TOP)/make/otp_subdir.mk -.PHONY: info gclean dialyzer dialyzer_plt dclean - -info: - @echo "OS: $(OS)" - @echo "DOCB: $(DOCB)" - @echo "" - @echo "FTP_VSN: $(FTP_VSN)" - @echo "APP_VSN: $(APP_VSN)" - @echo "" - @echo "DIA_PLT: $(DIA_PLT)" - @echo "DIA_ANALYSIS: $(DIA_ANALYSIS)" - @echo "" - -gclean: - git clean -fXd - -dclean: - rm -f $(DIA_PLT) - rm -f $(DIA_ANALYSIS) - -dialyzer_plt: $(DIA_PLT) - -$(DIA_PLT): - @echo "Building $(APPLICATION) plt file" - @dialyzer --build_plt \ - --output_plt $@ \ - -r ../$(APPLICATION)/ebin \ - --output $(DIA_ANALYSIS) \ - --verbose +DIA_PLT_APPS = runtime_tools ssl -dialyzer: $(DIA_PLT) - @echo "Running dialyzer on $(APPLICATION)" - @dialyzer --plt $< \ - ../$(APPLICATION)/ebin \ - --verbose +include $(ERL_TOP)/make/app_targets.mk diff --git a/lib/ftp/doc/src/Makefile b/lib/ftp/doc/src/Makefile index 20fbbc73a9..fc95e83ae8 100644 --- a/lib/ftp/doc/src/Makefile +++ b/lib/ftp/doc/src/Makefile @@ -26,12 +26,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk # ---------------------------------------------------- include ../../vsn.mk VSN=$(FTP_VSN) - -# ---------------------------------------------------- -# Release directory specification -# ---------------------------------------------------- -RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN) - +APPLICATION=ftp # ---------------------------------------------------- # Target Specs @@ -59,97 +54,6 @@ XML_FILES = \ $(XML_REF3_FILES) \ $(XML_APPLICATION_FILES) -# GIF_FILES = ftp.gif - - -# ---------------------------------------------------- - -HTML_FILES = \ - $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - -INFO_FILE = ../../info -EXTRA_FILES = \ - $(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_REF6_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html) - -MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - -HTML_REF_MAN_FILE = $(HTMLDIR)/index.html - -TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf - -# ---------------------------------------------------- -# FLAGS -# ---------------------------------------------------- -XML_FLAGS += -DVIPS_FLAGS += - -# ---------------------------------------------------- -# Targets -# ---------------------------------------------------- -$(HTMLDIR)/%.gif: %.gif - $(INSTALL_DATA) $< $@ - -docs: pdf html man - -ldocs: local_docs - -$(TOP_PDF_FILE): $(XML_FILES) - -pdf: $(TOP_PDF_FILE) - -html: gifs $(HTML_REF_MAN_FILE) - -clean clean_docs: clean_html clean_man clean_pdf - rm -rf $(XMLDIR) - rm -f errs core *~ - -man: $(MAN3_FILES) - -gifs: $(GIF_FILES:%=$(HTMLDIR)/%) - -debug opt: - -clean_pdf: - rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo) - -clean_html: - rm -rf $(TOP_HTML_FILES) $(HTMLDIR)/* - -clean_man: - rm -f $(MAN3_FILES) - - -# ---------------------------------------------------- -# Release Target -# ---------------------------------------------------- -include $(ERL_TOP)/make/otp_release_targets.mk - -release_docs_spec: docs - $(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf" - $(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf" - $(INSTALL_DIR) "$(RELSYSDIR)/doc/html" - $(INSTALL_DATA) $(HTMLDIR)/* "$(RELSYSDIR)/doc/html" - $(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)" - $(INSTALL_DIR) "$(RELEASE_PATH)/man/man3" - $(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3" - -release_spec: +# IMAGE_FILES = ftp.gif -info: - @echo "GIF_FILES:\n$(GIF_FILES)" - @echo "" - @echo "EXTRA_FILES:\n$(EXTRA_FILES)" - @echo "" - @echo "HTML_FILES:\n$(HTML_FILES)" - @echo "" - @echo "TOP_HTML_FILES:\n$(TOP_HTML_FILES)" - @echo "" - @echo "XML_REF3_FILES:\n$(XML_REF3_FILES)" - @echo "" - @echo "XML_REF6_FILES:\n$(XML_REF6_FILES)" - @echo "" - @echo "XML_CHAPTER_FILES:\n$(XML_CHAPTER_FILES)" - @echo "" +include $(ERL_TOP)/make/doc.mk diff --git a/lib/ftp/doc/src/ftp.xml b/lib/ftp/doc/src/ftp.xml index 9645b03364..5a1f289b57 100644 --- a/lib/ftp/doc/src/ftp.xml +++ b/lib/ftp/doc/src/ftp.xml @@ -58,7 +58,7 @@ binaries (see <c>recv_bin/2</c>) and for sending binaries to be stored as remote files (see <c>send_bin/3</c>).</p> - <p>A set of functions is provvided for sending and receiving + <p>A set of functions is provided for sending and receiving contiguous parts of a file to be stored in a remote file. For send, see <c>send_chunk_start/2</c>, <c>send_chunk/2</c>, and <c>send_chunk_end/1</c>. For receive, see diff --git a/lib/ftp/test/Makefile b/lib/ftp/test/Makefile index 147f8e5dd6..41f23ac7ba 100644 --- a/lib/ftp/test/Makefile +++ b/lib/ftp/test/Makefile @@ -115,7 +115,7 @@ SOURCE = $(ERL_FILES) $(HRL_FILES) TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) -FTP_SPECS = ftp.spec ftp_bench.spec +FTP_SPECS = ftp.spec COVER_FILE = ftp.cover FTP_FILES = ftp.config $(FTP_SPECS) diff --git a/lib/ftp/test/ftp_bench.spec b/lib/ftp/test/ftp_bench.spec deleted file mode 100644 index 4d1ecf8891..0000000000 --- a/lib/ftp/test/ftp_bench.spec +++ /dev/null @@ -1 +0,0 @@ -{suites,"../ftp_test",[]}. |