postgrespro
diff --git a/‎contrib/pg_arman/Makefile
Lines changed: 13 additions & 42 deletions b/‎contrib/pg_arman/Makefile
Lines changed: 13 additions & 42 deletions
diff --git a/‎contrib/pg_arman/README renamed to ‎contrib/pg_arman/README.md
Lines changed: 1 addition & 19 deletions b/‎contrib/pg_arman/README renamed to ‎contrib/pg_arman/README.md
Lines changed: 1 addition & 19 deletions
@@ -16,6 +16,8 @@ OBJS = backup.o \
 	datapagemap.o \
 	parsexlog.o \
 	xlogreader.o \
+	streamutil.o \
+	receivelog.o \
 	pgut/pgut.o \
 	pgut/pgut-port.o
 
@@ -25,17 +27,7 @@ EXTRA_CLEAN = datapagemap.c datapagemap.h xlogreader.c
 
 REGRESS = init option show delete backup restore
 
-# asciidoc and xmlto are present, so install the html documentation and man
-# pages as well. html is part of the vanilla documentation. Man pages need a
-# special handling at installation.
-ifneq ($(ASCIIDOC),)
-ifneq ($(XMLTO),)
-man_DOCS = doc/pg_arman.1
-DOCS += doc/pg_arman.html doc/README.html
-endif # XMLTO
-endif # ASCIIDOC
-
-all: docs datapagemap.h pg_arman
+all: datapagemap.h receivelog.h streamutil.h pg_arman
 ifdef $(USE_PGXS)
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -55,11 +47,9 @@ top_builddir=../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
-PG_CPPFLAGS = -I$(libpq_srcdir)
+PG_CPPFLAGS = -I$(libpq_srcdir) ${PTHREAD_CFLAGS}
 override CPPFLAGS := -DFRONTEND $(CPPFLAGS) $(PG_CPPFLAGS)
-PG_LIBS = $(libpq_pgport)
-
-
+PG_LIBS = $(libpq_pgport) ${PTHREAD_CFLAGS}
 
 envtest:
 	: top_srcdir=$(top_srcdir)
@@ -74,33 +64,14 @@ datapagemap.c: % : $(top_srcdir)/src/bin/pg_rewind/%
 	rm -f $@ && $(LN_S) $< .
 datapagemap.h: % : $(top_srcdir)/src/bin/pg_rewind/%
 	rm -f  && $(LN_S) $< .
-
-# Part related to documentation
-# Compile documentation as well is ASCIIDOC and XMLTO are defined
-ifneq ($(ASCIIDOC),)
-ifneq ($(XMLTO),)
-docs:
-	$(MAKE) -C doc/
-
-# Special handling for man pages, they need to be in a dedicated folder
-install: install-man
-
-install-man:
-	$(MKDIR_P) '$(DESTDIR)$(mandir)/man1/'
-	$(INSTALL_DATA) $(man_DOCS) '$(DESTDIR)$(mandir)/man1/'
-else
-docs:
-	@echo "No docs to build"
-endif # XMLTO
-else
-docs:
-	@echo "No docs to build"
-endif # ASCIIDOC
-
-# Clean up documentation as well
-clean: clean-docs
-clean-docs:
-	$(MAKE) -C doc/ clean
+receivelog.c: % : $(top_srcdir)/src/bin/pg_basebackup/%
+	rm -f  && $(LN_S) $< .
+receivelog.h: % : $(top_srcdir)/src/bin/pg_basebackup/%
+	rm -f  && $(LN_S) $< .
+streamutil.c: % : $(top_srcdir)/src/bin/pg_basebackup/%
+	rm -f  && $(LN_S) $< .
+streamutil.h: % : $(top_srcdir)/src/bin/pg_basebackup/%
+	rm -f  && $(LN_S) $< .
 
 # Disable make check
 check:
 
@@ -38,25 +38,7 @@ pg_arman has been tested on Linux and Unix-based platforms.
 Documentation
 -------------
 
-All the documentation is maintained in doc/ as text file, that is then
-fetched by asciidoc to generate automatically man pages and html
-documentation.
-
-In order to generate the documentation, the variables XMLTO and ASCIIDOC
-need to be set to proper values indicating where are located the binaries
-of respectively xmlto and asciidoc. An example of build is as follows:
-
-    make top_srcdir=<path to PostgreSQL source tree> \
-        ASCIIDOC=asciidoc XMLTO=xmlto
-
-They could as well be set as environment variables for development
-purposes.
-
-On OSX, it is necessary to set XML_CATALOG_FILES to point to the correct
-xml catalogs. In the case of an environment with Homebrew after having
-install xmlto and asciidoc:
-
-    export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"
+All the documentation you can find [here](doc/pg_arman.md).
 
 Regression tests
 ----------------