fix/simplify buildsystem for the (now) po4a-only manpages

2 files changed, 2 insertions, 46 deletions

diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index 3d90c6ba4..dfa215d29 100644
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -35,7 +35,8 @@ $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
 .PHONY: veryclean/$(LOCAL)
 veryclean/$(LOCAL):
 	-rm -rf $($(@F)-LIST) apt.ent apt.$(LC).8 \
-		$(addsuffix .xml,$($(@F)-LIST))
+		$(addsuffix .xml,$($(@F)-LIST)) \
+		offline.$(LC).sgml guide.$(LC).sgml
 
 HAVE_PO4A=yes
 endif
diff --git a/buildlib/sgml_manpage.mak b/buildlib/sgml_manpage.mak
deleted file mode 100644
index 5fcb75c46..000000000
--- a/buildlib/sgml_manpage.mak
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- make -*-
-
-# This handles man pages in DocBook SGMLL format. We convert to the respective
-# output in the source directory then copy over to the final dest. This
-# means yodl is only needed if compiling from CVS
-
-# Input
-# $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8
-#             the sgml files are called apt-cache.8.sgml
-
-# See defaults.mak for information about LOCAL
-
-# Some local definitions
-ifdef DOCBOOK2MAN
-
-LOCAL := sgml-manpage-$(firstword $(SOURCE))
-$(LOCAL)-LIST := $(SOURCE)
-
-# Install generation hooks
-doc: $($(LOCAL)-LIST)
-veryclean: veryclean/$(LOCAL)
-
-$($(LOCAL)-LIST) :: % : %.sgml $(INCLUDES)
-	echo Creating man page $@
-	$(DOCBOOK2MAN) $<
-
-# Clean rule
-.PHONY: veryclean/$(LOCAL)
-veryclean/$(LOCAL):
-	-rm -rf $($(@F)-LIST)
-
-HAVE_SGML=yes
-endif
-
-INCLUDES :=
-
-ifndef HAVE_SGML
-# Strip from the source list any man pages we dont have compiled already
-SOURCE := $(wildcard $(SOURCE))
-endif
-
-# Chain to the manpage rule
-ifneq ($(words $(SOURCE)),0)
-include $(MANPAGE_H)
-endif