r1630 - in dev/concept/moongoo: . libalfs syntax

neocool at linuxfromscratch.org neocool at linuxfromscratch.org
Sat Dec 4 11:44:22 PST 2004


Author: neocool
Date: 2004-12-04 12:44:22 -0700 (Sat, 04 Dec 2004)
New Revision: 1630

Modified:
   dev/concept/moongoo/Makefile
   dev/concept/moongoo/build.c
   dev/concept/moongoo/libalfs/alfs.c
   dev/concept/moongoo/libalfs/alfs.h
   dev/concept/moongoo/moongoo.c
   dev/concept/moongoo/syntax/Makefile
Log:
* Fixed a Makefile bug (targets weren't rebuild when libalfs.a changed)
* Added new role 'spawn', removed role 'chroot'


Modified: dev/concept/moongoo/Makefile
===================================================================
--- dev/concept/moongoo/Makefile	2004-12-04 07:06:45 UTC (rev 1629)
+++ dev/concept/moongoo/Makefile	2004-12-04 19:44:22 UTC (rev 1630)
@@ -1,11 +1,10 @@
 CFLAGS=-I. -Ilibalfs
-LDLIBS=-Llibalfs -lalfs
 
 BIN=moongoo
 OBJS=moongoo.o build.o plugin.o
 
 ifeq ($(OPTS),)
-OPTS=
+OPTS=-q
 OPTS+=~/projects/alfs/book/index.xml
 #OPTS+=~/projects/alfs/lfs-profile/LFS.xml
 #OPTS+=~/projects/alfs/ass/index.xml
@@ -20,7 +19,7 @@
 
 include inc.mak
 
-$(BIN): $(OBJS)
+$(BIN): $(OBJS) libalfs/libalfs.a
 
 run: $(BIN)
 	./$(BIN) $(OPTS)

Modified: dev/concept/moongoo/build.c
===================================================================
--- dev/concept/moongoo/build.c	2004-12-04 07:06:45 UTC (rev 1629)
+++ dev/concept/moongoo/build.c	2004-12-04 19:44:22 UTC (rev 1630)
@@ -12,6 +12,7 @@
 		for (j=0;j<prof->ch[i].n;j++)
 			for (k=0;k<prof->ch[i].pkg[j].n;k++)
 			{
+				// TODO: Does not seem to work properly anymore.
 				int m = 0, o;
 				bool no = false;
 				package *pkg = &prof->ch[i].pkg[j];

Modified: dev/concept/moongoo/libalfs/alfs.c
===================================================================
--- dev/concept/moongoo/libalfs/alfs.c	2004-12-04 07:06:45 UTC (rev 1629)
+++ dev/concept/moongoo/libalfs/alfs.c	2004-12-04 19:44:22 UTC (rev 1630)
@@ -207,8 +207,8 @@
 			return "testsuite";
 		case (INSTALL):
 			return "install";
-		case (CHROOT):
-			return "chroot";
+		case (SPAWN):
+			return "spawn";
 		default:
 			return "unknown";
 	}
@@ -228,8 +228,8 @@
 		return TESTSUITE;
 	if (!strcmp(prop, "install"))
 		return INSTALL;
-	if (!strcmp(prop, "chroot"))
-		return CHROOT;
+	if (!strcmp(prop, "spawn"))
+		return SPAWN;
 
 	fprintf(stderr, "%s is an unknown role-attribute.\n", prop);
 	

Modified: dev/concept/moongoo/libalfs/alfs.h
===================================================================
--- dev/concept/moongoo/libalfs/alfs.h	2004-12-04 07:06:45 UTC (rev 1629)
+++ dev/concept/moongoo/libalfs/alfs.h	2004-12-04 19:44:22 UTC (rev 1630)
@@ -14,7 +14,7 @@
 	INTERACTIVE,
 	TESTSUITE,
 	INSTALL,
-	CHROOT
+	SPAWN
 } role;
 
 typedef enum

Modified: dev/concept/moongoo/moongoo.c
===================================================================
--- dev/concept/moongoo/moongoo.c	2004-12-04 07:06:45 UTC (rev 1629)
+++ dev/concept/moongoo/moongoo.c	2004-12-04 19:44:22 UTC (rev 1630)
@@ -107,14 +107,16 @@
 		xmlFreeDoc(doc);
 		return 1;
 	}
-	
+
 	if (!quiet)
 	{
+		/*package *glibc = search_pkg(prof, "Glibc-20041115", 
+			"chapter-building-system");*/
 		build_paralell (prof, paralell_filter, popt_pkg, popt_cmd);
 		set_filter(default_filter);
-		// TODO: Make print_pkg segfault resistant
-		/*print_pkg(*search_pkg(prof, "Glibc-20041115", 
-			"chapter-building-system"));*/
+		
+		/*if (glibc)
+			print_pkg(*glibc);*/
 		print_profile(*prof);
 	}
 	

Modified: dev/concept/moongoo/syntax/Makefile
===================================================================
--- dev/concept/moongoo/syntax/Makefile	2004-12-04 07:06:45 UTC (rev 1629)
+++ dev/concept/moongoo/syntax/Makefile	2004-12-04 19:44:22 UTC (rev 1630)
@@ -1,8 +1,12 @@
 CFLAGS=-I../libalfs -I..
-LDLIBS=-L../libalfs -lalfs
 
-LIBS=$(patsubst %.c,%.so,$(wildcard *.c))
+LIBS=ass.so book.so nalfs.so syn.so
 
 all: $(LIBS)
 
 include ../inc.mak
+
+ass.so: ../libalfs/libalfs.a
+book.so: ../libalfs/libalfs.a
+nalfs.so: ../libalfs/libalfs.a
+syn.so: ../libalfs/libalfs.a




More information about the alfs-log mailing list