r492 - x86/trunk/packages/glib2

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Aug 2 05:49:59 PDT 2005


Author: jhuntwork
Date: 2005-08-02 06:49:58 -0600 (Tue, 02 Aug 2005)
New Revision: 492

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

Modified: x86/trunk/packages/glib2/Makefile
===================================================================
--- x86/trunk/packages/glib2/Makefile	2005-08-02 12:43:42 UTC (rev 491)
+++ x86/trunk/packages/glib2/Makefile	2005-08-02 12:49:58 UTC (rev 492)
@@ -1,28 +1,56 @@
 # Glib Makefile
+#==============================================================================
 
-# Package versions
 NM= glib
-VRS= 2.6.4
+VRS= 2.6.6
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= ftp://ftp.gtk.org/pub/gtk/v2.6/$(FILE)
+URL-$(FILE)= ftp://ftp.gtk.org/pub/gtk/v2.6/$(FILE)
+SHA-$(FILE)= 6bb8860bd29a83964ee66ad53ae3e4950aa2677f
 
-#RULES
+# Targets
+# =============================================================================
 
-.PHONY: clean chroot stage2
+include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM)2 $(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/lib/libglib-2.0.so ] ; 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