Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'team/clc-dev/CHUCK_INDENT' into maint/3.2/testing

  • Loading branch information...
commit 580d0eb455c62bddecf21f64cf90e6ed47c3878a 2 parents 09dcb17 + d241212
@gelinasc gelinasc authored
View
2  Makedefs.in
@@ -48,6 +48,8 @@ WSDL2C = @WSDL2C@
JAVA_HOME = @JAVA_HOME@
RM = @RM@
PYTHON = @PYTHON@
+INDENTTOOLS = indent
+INDENTFLAGS = -nbad -bap -nbc -bbo -hnl -br -brs -c33 -cd33 -ncdb -ce -ci4 -cli0 -d0 -di1 -nfc1 -i4 -ut -ip0 -l200 -lp -npcs -nprs -npsl -sai -saf -saw -ncs -nsc -sob -nfca -ss -ts4 -il0 -nip
# compile time configurations
euca_theme = @INTERFACE_THEME@
View
2  Makefile
@@ -72,7 +72,7 @@ uninstall:
@for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit $$? ; done
-indent:
+indent: Makedefs
@for subdir in $(INDENTDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit $$? ; done
View
6 clc/modules/bootstrap/src/main/native/Makefile
@@ -89,8 +89,10 @@ install: eucalyptus-cloud
$(INSTALL) -m 0755 eucalyptus-cloud $(DESTDIR)$(sbindir)/eucalyptus-cloud
indent:
- @indent *.[ch] -nbad -bap -nbc -bbo -hnl -br -brs -c33 -cd33 -ncdb -ce -ci4 -cli0 -d0 -di1 -nfc1 -i4 -ut -ip0 -l200 -lp -npcs -nprs -npsl -sai -saf -saw -ncs -nsc -sob -nfca -ss -ts4 -il0 -nip
- @\rm *.*~
+ @for idfile in *.[ch]; do \
+ echo $(INDENTTOOLS) $$idfile $(INDENTFLAGS) -o $$idfile ; \
+ $(INDENTTOOLS) $$idfile $(INDENTFLAGS) -o $$idfile ; \
+ done
clean:
@$(RM) -f $(OBJS) eucalyptus-cloud
View
6 clc/modules/storage-controller/native/Makefile
@@ -83,8 +83,10 @@ $(LIBDIR)/$(DAS_SO):
gcc -shared $(CFLAGS) -o $(LIBDIR)/$(DAS_SO) com_eucalyptus_storage_DASManager.c
indent:
- @indent *.[ch] -nbad -bap -nbc -bbo -hnl -br -brs -c33 -cd33 -ncdb -ce -ci4 -cli0 -d0 -di1 -nfc1 -i4 -ut -ip0 -l200 -lp -npcs -nprs -npsl -sai -saf -saw -ncs -nsc -sob -nfca -ss -ts4 -il0 -nip
- @\rm *.*~
+ @for idfile in *.[ch]; do \
+ echo $(INDENTTOOLS) $$idfile $(INDENTFLAGS) -o $$idfile ; \
+ $(INDENTTOOLS) $$idfile $(INDENTFLAGS) -o $$idfile ; \
+ done
clean:
rm -rf $(LIBDIR)
View
6 cluster/Makefile
@@ -172,8 +172,10 @@ deploy:
# cp $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
indent:
- @indent *.[ch] -nbad -bap -nbc -bbo -hnl -br -brs -c33 -cd33 -ncdb -ce -ci4 -cli0 -d0 -di1 -nfc1 -i4 -ut -ip0 -l200 -lp -npcs -nprs -npsl -sai -saf -saw -ncs -nsc -sob -nfca -ss -ts4 -il0 -nip
- @\rm *.*~
+ @for idfile in *.[ch]; do \
+ echo $(INDENTTOOLS) $$idfile $(INDENTFLAGS) -o $$idfile ; \
+ $(INDENTTOOLS) $$idfile $(INDENTFLAGS) -o $$idfile ; \
+ done
clean:
rm -f $(SERVICE_SO) $(SERVICE_SO_FAKE) *.o $(CLIENTKILLALL) $(CLIENT)_full $(SHUTDOWNCC) *~* *#*
View
6 gatherlog/Makefile
@@ -122,8 +122,10 @@ deploy:
$(INSTALL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
indent:
- @indent *.[ch] -nbad -bap -nbc -bbo -hnl -br -brs -c33 -cd33 -ncdb -ce -ci4 -cli0 -d0 -di1 -nfc1 -i4 -ut -ip0 -l200 -lp -npcs -nprs -npsl -sai -saf -saw -ncs -nsc -sob -nfca -ss -ts4 -il0 -nip
- @\rm *.*~
+ @for idfile in *.[ch]; do \
+ echo $(INDENTTOOLS) $$idfile $(INDENTFLAGS) -o $$idfile ; \
+ $(INDENTTOOLS) $$idfile $(INDENTFLAGS) -o $$idfile ; \
+ done
clean:
rm -f $(SERVICE_SO) *.o $(CLIENT) *~* *#*
View
6 net/Makefile
@@ -70,8 +70,10 @@ build: all
$(CC) -c $(CFLAGS) $(INCLUDES) $<
indent:
- @indent *.[ch] -nbad -bap -nbc -bbo -hnl -br -brs -c33 -cd33 -ncdb -ce -ci4 -cli0 -d0 -di1 -nfc1 -i4 -ut -ip0 -l200 -lp -npcs -nprs -npsl -sai -saf -saw -ncs -nsc -sob -nfca -ss -ts4 -il0 -nip
- @\rm *.*~
+ @for idfile in *.[ch]; do \
+ echo $(INDENTTOOLS) $$idfile $(INDENTFLAGS) -o $$idfile ; \
+ $(INDENTTOOLS) $$idfile $(INDENTFLAGS) -o $$idfile ; \
+ done
clean:
rm -rf *~ *.o
View
6 storage/Makefile
@@ -112,8 +112,10 @@ test_url: http.c
make -C ../util
indent:
- @indent *.[ch] -nbad -bap -nbc -bbo -hnl -br -brs -c33 -cd33 -ncdb -ce -ci4 -cli0 -d0 -di1 -nfc1 -i4 -ut -ip0 -l200 -lp -npcs -nprs -npsl -sai -saf -saw -ncs -nsc -sob -nfca -ss -ts4 -il0 -nip
- @\rm *.*~
+ @for idfile in *.[ch]; do \
+ echo $(INDENTTOOLS) $$idfile $(INDENTFLAGS) -o $$idfile ; \
+ $(INDENTTOOLS) $$idfile $(INDENTFLAGS) -o $$idfile ; \
+ done
clean:
rm -rf *~ *.o Wclient euca-blobs $(TESTS)
View
6 util/Makefile
@@ -100,8 +100,10 @@ test_sensor: sensor.c sensor.h misc.o log.o ipc.o ../storage/diskutil.o
$(CC) -c -std=gnu99 $(CFLAGS) $(INCLUDES) $(DEBUGS) `xslt-config --cflags` $<
indent:
- @indent *.[ch] -nbad -bap -nbc -bbo -hnl -br -brs -c33 -cd33 -ncdb -ce -ci4 -cli0 -d0 -di1 -nfc1 -i4 -ut -ip0 -l200 -lp -npcs -nprs -npsl -sai -saf -saw -ncs -nsc -sob -nfca -ss -ts4 -il0 -nip
- @\rm *.*~
+ @for idfile in *.[ch]; do \
+ echo $(INDENTTOOLS) $$idfile $(INDENTFLAGS) -o $$idfile ; \
+ $(INDENTTOOLS) $$idfile $(INDENTFLAGS) -o $$idfile ; \
+ done
clean:
rm -rf *~ *.o test test_fault euca-generate-fault test_misc test_wc euca_rootwrap euca_mountwrap test_sensor
Please sign in to comment.
Something went wrong with that request. Please try again.