Skip to contentSkip to conversation

fix up xfs-cmds build after the parallel-fest

PATCH Superseded Eric Sandeen 2 participants 4 messages Dec 5, 2008 – Dec 6, 2008

lore
Share & tools
lore

Eric Sandeen

author
#0 lore raw

PATCH 1/1 fix up xfs-cmds build after the parallel-fest

My big parallel build patch lost the "make configure" target. This broke Makepkgs...

Now, IMHO, running configure from make is a little bass-ackwards; I'd probably prefer to have Makepkgs explicitly run:

autoconf; configure --myoptions; make

but for now, this adds back in a workable "make configure" target.

Also fixed "make install-lib" for acl, which was failing in the man subdir.

Signed-off-by Eric Sandeen <[email protected]>
acl/Makefile +1 -1
Index: xfs-cmds/acl/Makefile
===================================================================
@@ -38,7 +38,7 @@ else
 clean:	# if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
 	autoconf
 	./configure \
 		--prefix=/ \
acl/man/Makefile +5 -0
Index: xfs-cmds/acl/man/Makefile
===================================================================
@@ -13,10 +13,15 @@ install : $(addsuffix -install,$(SUBDIRS
 
 install-dev : $(addsuffix -install-dev,$(SUBDIRS))
 
+install-lib: $(addsuffix -install-lib,$(SUBDIRS))
+
 %-install:
 	$(MAKE) -C $* install
 
 %-install-dev:
 	$(MAKE) -C $* install-dev
 
+%-install-lib:
+	$(MAKE) -C $* install-lib
+
 include $(BUILDRULES)
dmapi/Makefile +1 -1
Index: xfs-cmds/dmapi/Makefile
===================================================================
@@ -36,7 +36,7 @@ else
 clean:	# if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
 	autoconf
 	./configure \
 		--prefix=/ \
xfsprogs/Makefile +1 -1
Index: xfs-cmds/xfsprogs/Makefile
===================================================================
@@ -44,7 +44,7 @@ else
 clean:	# if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
 	autoconf
 	./configure \
 		--prefix=/ \
xfsdump/Makefile +1 -1
Index: xfs-cmds/xfsdump/Makefile
===================================================================
@@ -37,7 +37,7 @@ else
 clean:	# if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
 	autoconf
 	./configure \
 		--prefix=/ \
nfs4acl/Makefile +1 -1
Index: xfs-cmds/nfs4acl/Makefile
===================================================================
@@ -39,7 +39,7 @@ else
 clean:	# if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
 	autoconf
 	./configure \
 		--prefix=/ \
xfstests/Makefile +1 -1
Index: xfs-cmds/xfstests/Makefile
===================================================================
@@ -42,7 +42,7 @@ else
 clean:  # if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
 	autoheader
 	autoconf
 	./configure \

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#1 lore raw
Quoted 6 lines · Eric Sandeen

My big parallel build patch lost the "make configure" target. This broke Makepkgs...

Now, IMHO, running configure from make is a little bass-ackwards; I'd probably prefer to have Makepkgs explicitly run:

Quoted 6 lines

autoconf; configure --myoptions; make

but for now, this adds back in a workable "make configure" target.

Also fixed "make install-lib" for acl, which was failing in the man subdir.

Thanks, this fixes the dpkg build for me.

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#2 lore raw
Quoted 1 line · Christoph Hellwig

Thanks, this fixes the dpkg build for me.

But it misses one hunk to fix the attr build, too:

attr/Makefile +1 -1
Index: xfs-cmds-git/attr/Makefile
===================================================================
@@ -39,7 +39,7 @@ else
 clean:	# if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
 	autoconf
 	./configure \
 		--prefix=/ \

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

author
#3 lore raw

PATCH v2 1/1 fix up xfs-cmds build after the parallel-fest

Quoted 7 lines · Christoph Hellwig
Quoted 2 lines · Christoph Hellwig

Thanks, this fixes the dpkg build for me.

But it misses one hunk to fix the attr build, too:

Grr, quilt is nice exept for that pesky quilt add step. :)

================================================================

My big parallel build patch lost the "make configure" target. This broke Makepkgs...

Now, IMHO, running configure from make is a little bass-ackwards; I'd probably prefer to have Makepkgs explicitly run:

autoconf; configure --myoptions; make

but for now, this adds back in a workable "make configure" target. This time, for attr as well!

Also fixed "make install-lib" for acl, which was failing in the man subdir.

Signed-off-by Eric Sandeen <[email protected]>

---

acl/Makefile +1 -1
Index: xfs-cmds/acl/Makefile
===================================================================
@@ -38,7 +38,7 @@ else
 clean:	# if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
 	autoconf
 	./configure \
 		--prefix=/ \
acl/man/Makefile +5 -0
Index: xfs-cmds/acl/man/Makefile
===================================================================
@@ -13,10 +13,15 @@ install : $(addsuffix -install,$(SUBDIRS
 
 install-dev : $(addsuffix -install-dev,$(SUBDIRS))
 
+install-lib: $(addsuffix -install-lib,$(SUBDIRS))
+
 %-install:
 	$(MAKE) -C $* install
 
 %-install-dev:
 	$(MAKE) -C $* install-dev
 
+%-install-lib:
+	$(MAKE) -C $* install-lib
+
 include $(BUILDRULES)
attr/Makefile +1 -1
Index: xfs-cmds/attr/Makefile
===================================================================
@@ -39,7 +39,7 @@ else
 clean:	# if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
 	autoconf
 	./configure \
 		--prefix=/ \
dmapi/Makefile +1 -1
Index: xfs-cmds/dmapi/Makefile
===================================================================
@@ -36,7 +36,7 @@ else
 clean:	# if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
 	autoconf
 	./configure \
 		--prefix=/ \
xfsprogs/Makefile +1 -1
Index: xfs-cmds/xfsprogs/Makefile
===================================================================
@@ -44,7 +44,7 @@ else
 clean:	# if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
 	autoconf
 	./configure \
 		--prefix=/ \
xfsdump/Makefile +1 -1
Index: xfs-cmds/xfsdump/Makefile
===================================================================
@@ -37,7 +37,7 @@ else
 clean:	# if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
 	autoconf
 	./configure \
 		--prefix=/ \
nfs4acl/Makefile +1 -1
Index: xfs-cmds/nfs4acl/Makefile
===================================================================
@@ -39,7 +39,7 @@ else
 clean:	# if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
 	autoconf
 	./configure \
 		--prefix=/ \
xfstests/Makefile +1 -1
Index: xfs-cmds/xfstests/Makefile
===================================================================
@@ -42,7 +42,7 @@ else
 clean:  # if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
 	autoheader
 	autoconf
 	./configure \

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs