WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 		  
Home Products Support Community News
 
   
 

xen-changelog

[Top] [All Lists]
<prev [Date] next>
[Advanced]
 <prev [Thread] next>

[Xen-changelog] [xen-unstable] remus: Fix makefiles for indentation

from [Xen patchbot-unstable] [Permanent Link][Original]
To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] remus: Fix makefiles for indentation
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Fri, 13 Nov 2009 09:05:09 -0800
Delivery-date: Fri, 13 Nov 2009 09:05:11 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx 
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1258131745 0
# Node ID 5b921ccbc8f97e3878f253a27e9e51117322768c
# Parent  49deb113cd4051f2bd0006102ad26bb91888fbbb
remus: Fix makefiles for indentation
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/remus/Makefile                   |    4 -
 tools/remus/imqebt/Makefile            |   84 ++++++++++++++++-----------------
 tools/remus/imqebt/extensions/Makefile |   12 ++--
 tools/remus/kmod/Makefile              |    6 +-
 4 files changed, 53 insertions(+), 53 deletions(-)

diff -r 49deb113cd40 -r 5b921ccbc8f9 tools/remus/Makefile
--- a/tools/remus/Makefile      Fri Nov 13 15:46:58 2009 +0000
+++ b/tools/remus/Makefile      Fri Nov 13 17:02:25 2009 +0000
@@ -10,8 +10,8 @@ all: subdirs-all
 
 .PHONY: install
 install: subdirs-install
-       $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-       $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(BINDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+       $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(BINDIR)
 
 .PHONY: clean
 clean: subdirs-clean
diff -r 49deb113cd40 -r 5b921ccbc8f9 tools/remus/imqebt/Makefile
--- a/tools/remus/imqebt/Makefile       Fri Nov 13 15:46:58 2009 +0000
+++ b/tools/remus/imqebt/Makefile       Fri Nov 13 17:02:25 2009 +0000
@@ -31,11 +31,11 @@ EBTD_ARGC_MAX?=50
 EBTD_ARGC_MAX?=50
 
 PROGSPECS:=-DPROGVERSION=\"$(PROGVERSION)\" \
-       -DPROGNAME=\"$(PROGNAME)\" \
-       -DPROGDATE=\"$(PROGDATE)\" \
-       -D_PATH_ETHERTYPES=\"$(ETHERTYPESFILE)\" \
-       -DEBTD_ARGC_MAX=$(EBTD_ARGC_MAX) \
-       -DEBTD_CMDLINE_MAXLN=$(EBTD_CMDLINE_MAXLN)
+       -DPROGNAME=\"$(PROGNAME)\" \
+       -DPROGDATE=\"$(PROGDATE)\" \
+       -D_PATH_ETHERTYPES=\"$(ETHERTYPESFILE)\" \
+       -DEBTD_ARGC_MAX=$(EBTD_ARGC_MAX) \
+       -DEBTD_CMDLINE_MAXLN=$(EBTD_CMDLINE_MAXLN)
 
 # Uncomment for debugging (slower)
 #PROGSPECS+=-DEBT_DEBUG
@@ -52,46 +52,46 @@ build: $(PROGRAMS)
 # a little scripting for a static binary, making one for ebtables-restore
 # should be completely analogous
 imqebt: extensions/ebt_*.c extensions/ebtable_*.c ebtables.c communication.c 
ebtables-standalone.c getethertype.c libebtc.c useful_functions.c
-       cp ebtables-standalone.c ebtables-standalone.c_ ; \
-       cp include/ebtables_u.h include/ebtables_u.h_ ; \
-       sed "s/ main(/ pseudomain(/" ebtables-standalone.c > 
ebtables-standalone.c__ ; \
-       mv ebtables-standalone.c__ ebtables-standalone.c ; \
-       printf "\nint main(int argc, char *argv[])\n{\n "  >> 
ebtables-standalone.c ; \
-       for arg in $(EXT_FUNC) \
-       ; do \
-       sed s/_init/_$${arg}_init/ extensions/ebt_$${arg}.c > 
extensions/ebt_$${arg}.c_ ; \
-       mv extensions/ebt_$${arg}.c_ extensions/ebt_$${arg}.c ; \
-       printf "\t%s();\n" _$${arg}_init >> ebtables-standalone.c ; \
-       printf "extern void %s(void);\n" _$${arg}_init >> include/ebtables_u.h 
; \
-       done ; \
-       for arg in $(EXT_TABLES) \
-       ; do \
-       sed s/_init/_t_$${arg}_init/ extensions/ebtable_$${arg}.c > 
extensions/ebtable_$${arg}.c_ ; \
-       mv extensions/ebtable_$${arg}.c_ extensions/ebtable_$${arg}.c ; \
-       printf "\t%s();\n" _t_$${arg}_init >> ebtables-standalone.c ; \
-       printf "extern void %s(void);\n" _t_$${arg}_init >> 
include/ebtables_u.h ; \
-       done ; \
-       printf "\n\tpseudomain(argc, argv);\n\treturn 0;\n}\n" >> 
ebtables-standalone.c ;\
-       $(CC) $(CFLAGS) $(PROGSPECS) -o $@ $^ -I$(KERNEL_INCLUDES) -Iinclude ; \
-       for arg in $(EXT_FUNC) \
-       ; do \
-       sed "s/ .*_init/ _init/" extensions/ebt_$${arg}.c > 
extensions/ebt_$${arg}.c_ ; \
-       mv extensions/ebt_$${arg}.c_ extensions/ebt_$${arg}.c ; \
-       done ; \
-       for arg in $(EXT_TABLES) \
-       ; do \
-       sed "s/ .*_init/ _init/" extensions/ebtable_$${arg}.c > 
extensions/ebtable_$${arg}.c_ ; \
-       mv extensions/ebtable_$${arg}.c_ extensions/ebtable_$${arg}.c ; \
-       done ; \
-       mv ebtables-standalone.c_ ebtables-standalone.c ; \
-       mv include/ebtables_u.h_ include/ebtables_u.h
+       cp ebtables-standalone.c ebtables-standalone.c_ ; \
+       cp include/ebtables_u.h include/ebtables_u.h_ ; \
+       sed "s/ main(/ pseudomain(/" ebtables-standalone.c > 
ebtables-standalone.c__ ; \
+       mv ebtables-standalone.c__ ebtables-standalone.c ; \
+       printf "\nint main(int argc, char *argv[])\n{\n "  >> 
ebtables-standalone.c ; \
+       for arg in $(EXT_FUNC) \
+       ; do \
+       sed s/_init/_$${arg}_init/ extensions/ebt_$${arg}.c > 
extensions/ebt_$${arg}.c_ ; \
+       mv extensions/ebt_$${arg}.c_ extensions/ebt_$${arg}.c ; \
+       printf "\t%s();\n" _$${arg}_init >> ebtables-standalone.c ; \
+       printf "extern void %s(void);\n" _$${arg}_init >> include/ebtables_u.h 
; \
+       done ; \
+       for arg in $(EXT_TABLES) \
+       ; do \
+       sed s/_init/_t_$${arg}_init/ extensions/ebtable_$${arg}.c > 
extensions/ebtable_$${arg}.c_ ; \
+       mv extensions/ebtable_$${arg}.c_ extensions/ebtable_$${arg}.c ; \
+       printf "\t%s();\n" _t_$${arg}_init >> ebtables-standalone.c ; \
+       printf "extern void %s(void);\n" _t_$${arg}_init >> 
include/ebtables_u.h ; \
+       done ; \
+       printf "\n\tpseudomain(argc, argv);\n\treturn 0;\n}\n" >> 
ebtables-standalone.c ;\
+       $(CC) $(CFLAGS) $(PROGSPECS) -o $@ $^ -I$(KERNEL_INCLUDES) -Iinclude ; \
+       for arg in $(EXT_FUNC) \
+       ; do \
+       sed "s/ .*_init/ _init/" extensions/ebt_$${arg}.c > 
extensions/ebt_$${arg}.c_ ; \
+       mv extensions/ebt_$${arg}.c_ extensions/ebt_$${arg}.c ; \
+       done ; \
+       for arg in $(EXT_TABLES) \
+       ; do \
+       sed "s/ .*_init/ _init/" extensions/ebtable_$${arg}.c > 
extensions/ebtable_$${arg}.c_ ; \
+       mv extensions/ebtable_$${arg}.c_ extensions/ebtable_$${arg}.c ; \
+       done ; \
+       mv ebtables-standalone.c_ ebtables-standalone.c ; \
+       mv include/ebtables_u.h_ include/ebtables_u.h
 
 .PHONY: install
 install: build
-       $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
-       $(INSTALL_PROG) $(PROGRAMS) $(DESTDIR)$(PRIVATE_BINDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+       $(INSTALL_PROG) $(PROGRAMS) $(DESTDIR)$(PRIVATE_BINDIR)
 
 .PHONY: clean
 clean:
-       rm -f imqebt
-       rm -f *.o *~ *.so
+       rm -f imqebt
+       rm -f *.o *~ *.so
diff -r 49deb113cd40 -r 5b921ccbc8f9 tools/remus/imqebt/extensions/Makefile
--- a/tools/remus/imqebt/extensions/Makefile    Fri Nov 13 15:46:58 2009 +0000
+++ b/tools/remus/imqebt/extensions/Makefile    Fri Nov 13 17:02:25 2009 +0000
@@ -10,20 +10,20 @@ EXT_LIBSI+=$(foreach T,$(EXT_TABLES), -l
 EXT_LIBSI+=$(foreach T,$(EXT_TABLES), -lebtable_$(T))
 
 extensions/ebt_%.so: extensions/ebt_%.o
-       $(CC) -shared -o $@ -lc $< -nostartfiles
+       $(CC) -shared -o $@ -lc $< -nostartfiles
 
 extensions/libebt_%.so: extensions/ebt_%.so
-       mv $< $@
+       mv $< $@
 
 extensions/ebtable_%.so: extensions/ebtable_%.o
-       $(CC) -shared -o $@ -lc $< -nostartfiles
+       $(CC) -shared -o $@ -lc $< -nostartfiles
 
 extensions/libebtable_%.so: extensions/ebtable_%.so
-       mv $< $@
+       mv $< $@
 
 extensions/ebt_%.o: extensions/ebt_%.c include/ebtables_u.h
-       $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< 
-I$(KERNEL_INCLUDES)
+       $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< 
-I$(KERNEL_INCLUDES)
 
 extensions/ebtable_%.o: extensions/ebtable_%.c
-       $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< 
-I$(KERNEL_INCLUDES)
+       $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< 
-I$(KERNEL_INCLUDES)
 
diff -r 49deb113cd40 -r 5b921ccbc8f9 tools/remus/kmod/Makefile
--- a/tools/remus/kmod/Makefile Fri Nov 13 15:46:58 2009 +0000
+++ b/tools/remus/kmod/Makefile Fri Nov 13 17:02:25 2009 +0000
@@ -14,11 +14,11 @@ KERNELDIR ?= $(XEN_ROOT)/build-linux-$(L
 
 .PHONY: all
 all:
-       if test -d $(KERNELDIR); then $(MAKE) -C $(KERNELDIR) SUBDIRS=`pwd` 
modules; fi
+       if test -d $(KERNELDIR); then $(MAKE) -C $(KERNELDIR) SUBDIRS=`pwd` 
modules; fi
 
 .PHONY: install
 install:
-       if test -d $(KERNELDIR); then $(MAKE) -C $(KERNELDIR) SUBDIRS=`pwd` 
INSTALL_MOD_PATH=$(DESTDIR) modules_install; fi
+       if test -d $(KERNELDIR); then $(MAKE) -C $(KERNELDIR) SUBDIRS=`pwd` 
INSTALL_MOD_PATH=$(DESTDIR) modules_install; fi
 
 clean::
-       -rm -rf *.o *.ko *.mod.c *.mod.o Module.symvers .*.cmd .tmp_versions
+       -rm -rf *.o *.ko *.mod.c *.mod.o Module.symvers .*.cmd .tmp_versions

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
[More with this subject...]
<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] remus: Fix makefiles for indentation, Xen patchbot-unstable <=
Previous by Date:  [Xen-changelog] [xen-unstable] Remus: support for network buffering, Xen patchbot-unstable
Next by Date:  [Xen-changelog] [xen-unstable] remus: Add missing unistd.h include from libcheckpoint.c, Xen patchbot-unstable
Previous by Thread:  [Xen-changelog] [xen-unstable] Remus: support for network buffering, Xen patchbot-unstable
Next by Thread:  [Xen-changelog] [xen-unstable] remus: Add missing unistd.h include from libcheckpoint.c, Xen patchbot-unstable
Indexes:  [Date] [Thread] [Top] [All Lists]
 
   

Copyright , Citrix Systems Inc. All rights reserved. Legal and Privacy