projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge bzr://10.0.3.21 Build: jenkins-Libmemcached-469
[awesomized/libmemcached]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index d001031047c8c09b3b6963d943f8094b6e4c9539..895debbc01a83515345979683eec4401ec62dccd 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-74,7
+74,7
@@
endif
include libmemcachedinternal/include.am
include libmemcachedinternal/util/include.am
include libmemcachedinternal/include.am
include libmemcachedinternal/util/include.am
-include rpm/include.
am
+include rpm/include.
mk
include support/include.am
include tests/include.am
include util/include.am
include support/include.am
include tests/include.am
include util/include.am
@@
-96,7
+96,6
@@
merge-clean:
@find ./ | $(GREP) \.moved | xargs rm -r -f
@find ./ | $(GREP) \\.orig | xargs rm -f
@find ./ | $(GREP) \.rej | xargs rm -f
@find ./ | $(GREP) \.moved | xargs rm -r -f
@find ./ | $(GREP) \\.orig | xargs rm -f
@find ./ | $(GREP) \.rej | xargs rm -f
- @rm -f *\.rpm
@find ./ | $(GREP) \.THIS | xargs rm -f
@find ./ | $(GREP) \.OTHER | xargs rm -f
@find ./ | $(GREP) \.BASE | xargs rm -f
@find ./ | $(GREP) \.THIS | xargs rm -f
@find ./ | $(GREP) \.OTHER | xargs rm -f
@find ./ | $(GREP) \.BASE | xargs rm -f