r496 - x86/trunk/packages/expat

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Aug 2 11:10:30 PDT 2005


Author: jhuntwork
Date: 2005-08-02 12:10:29 -0600 (Tue, 02 Aug 2005)
New Revision: 496

Modified:
   x86/trunk/packages/expat/Makefile
Log:
Updated expat Makefile

Modified: x86/trunk/packages/expat/Makefile
===================================================================
--- x86/trunk/packages/expat/Makefile	2005-08-02 18:03:36 UTC (rev 495)
+++ x86/trunk/packages/expat/Makefile	2005-08-02 18:10:29 UTC (rev 496)
@@ -1,30 +1,56 @@
 # Expat Makefile
+#==============================================================================
 
-# Package versions
 NM= expat
 VRS= 1.95.8
 DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.gz
-URL= http://easynews.dl.sourceforge.net/sourceforge/expat/$(FILE)
 
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTPBLFS)/D-E/$(FILE)
+SHA-$(FILE)= 2bd162283c34093912882fec2081b82027026ad0
 
+# Targets
+# =============================================================================
 
-#RULES
+include $(ROOT)/scripts/functions
 
-.PHONY: clean chroot stage2
-
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f /usr/bin/xmlwf ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr && \
-	 make -j3 && make install ; fi
-	@make clean
+stage2: Makefile $(FILE) 
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list