From 4f39e935c364fa4c88a42fe53238bd3852d8349b Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Thu, 5 Mar 2009 11:59:24 +0000
Subject: [poppler] cleanups + restore lfu's copyright

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9973 33e552b5-05e3-0310-8538-816dae2090ed
---
 rules/poppler.make | 62 +++++++++++-------------------------------------------
 1 file changed, 12 insertions(+), 50 deletions(-)

(limited to 'rules/poppler.make')

diff --git a/rules/poppler.make b/rules/poppler.make
index 17e110f9e..9562d1477 100644
--- a/rules/poppler.make
+++ b/rules/poppler.make
@@ -1,7 +1,8 @@
 # -*-makefile-*-
 # $Id: template-make 9053 2008-11-03 10:58:48Z wsa $
 #
-# Copyright (C) 2009 by Robert Schwebel
+# Copyright (C) 2007 by Luotao Fu <l.fu@pengutronix.de>
+#               2009 by Robert Schwebel
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -32,17 +33,6 @@ $(POPPLER_SOURCE):
 	@$(call targetinfo)
 	@$(call get, POPPLER)
 
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/poppler.extract:
-	@$(call targetinfo)
-	@$(call clean, $(POPPLER_DIR))
-	@$(call extract, POPPLER)
-	@$(call patchin, POPPLER)
-	@$(call touch)
-
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
@@ -96,32 +86,6 @@ else
 POPPLER_AUTOCONF += --disable-poppler-glib
 endif
 
-$(STATEDIR)/poppler.prepare:
-	@$(call targetinfo)
-	@$(call clean, $(POPPLER_DIR)/config.cache)
-	cd $(POPPLER_DIR) && \
-		$(POPPLER_PATH) $(POPPLER_ENV) \
-		./configure $(POPPLER_AUTOCONF)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/poppler.compile:
-	@$(call targetinfo)
-	cd $(POPPLER_DIR) && $(POPPLER_PATH) $(MAKE) $(PARALLELMFLAGS)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/poppler.install:
-	@$(call targetinfo)
-	@$(call install, POPPLER)
-	@$(call touch)
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -130,16 +94,15 @@ $(STATEDIR)/poppler.targetinstall:
 	@$(call targetinfo)
 
 	@$(call install_init,  poppler)
-	@$(call install_fixup, poppler,PACKAGE,poppler)
-	@$(call install_fixup, poppler,PRIORITY,optional)
-	@$(call install_fixup, poppler,VERSION,$(POPPLER_VERSION))
-	@$(call install_fixup, poppler,SECTION,base)
-	@$(call install_fixup, poppler,AUTHOR,"")
-	@$(call install_fixup, poppler,DEPENDS,)
-	@$(call install_fixup, poppler,DESCRIPTION,missing)
-
-	@$(call install_copy, poppler, 0, 0, 0755,\
-		$(POPPLER_DIR)/poppler/.libs/libpoppler.so.4.0.0, /usr/lib/libpoppler.so.4.0.0)
+	@$(call install_fixup, poppler, PACKAGE, poppler)
+	@$(call install_fixup, poppler, PRIORITY, optional)
+	@$(call install_fixup, poppler, VERSION, $(POPPLER_VERSION))
+	@$(call install_fixup, poppler, SECTION, base)
+	@$(call install_fixup, poppler, AUTHOR, "r.schwebel@pengutronix.de")
+	@$(call install_fixup, poppler, DEPENDS,)
+	@$(call install_fixup, poppler, DESCRIPTION, missing)
+
+	@$(call install_copy, poppler, 0, 0, 0755, -, /usr/lib/libpoppler.so.4.0.0)
 	@$(call install_link, poppler, libpoppler.so.4.0.0, /usr/lib/libpoppler.so.4)
 	@$(call install_link, poppler, libpoppler.so.4.0.0, /usr/lib/libpoppler.so)
 
@@ -150,8 +113,7 @@ ifdef PTXCONF_POPPLER_BIN
 endif
 
 ifdef PTXCONF_POPPLER_GLIB
-	@$(call install_copy, poppler, 0, 0, 0755,\
-		$(POPPLER_DIR)/glib/.libs/libpoppler-glib.so.4.0.0, /usr/lib/libpoppler-glib.so.4.0.0)
+	@$(call install_copy, poppler, 0, 0, 0755, -, /usr/lib/libpoppler-glib.so.4.0.0)
 	@$(call install_link, poppler, libpoppler-glib.so.4.0.0, /usr/lib/libpoppler-glib.so.4)
 	@$(call install_link, poppler, libpoppler-glib.so.4.0.0, /usr/lib/libpoppler-glib.so)
 endif
-- 
cgit v1.2.3