projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updated for AES encryption.
[m6w6/libmemcached]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 65e07090f26d3de5d1ffca1f19b0ff4d37c89c23..4d94c2fc2267fd9667a92c12ef8703dd16114e98 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,8
+1,10
@@
+# vim:ft=automake
+
ACLOCAL_AMFLAGS = -I m4
# includes append to these:
SUFFIXES =
ACLOCAL_AMFLAGS = -I m4
# includes append to these:
SUFFIXES =
-PHONY =
+
.
PHONY =
TESTS =
CLEANFILES =
DISTCLEANFILES =
TESTS =
CLEANFILES =
DISTCLEANFILES =
@@
-24,27
+26,32
@@
EXTRA_DIST= \
README.win32 \
config/autorun.sh \
config/pandora-plugin \
README.win32 \
config/autorun.sh \
config/pandora-plugin \
- config/uncrustify.cfg \
- m4/ac_cxx_header_stdcxx_98.m4 \
- m4/acx_pthread.m4 \
- m4/gettext.m4 \
- m4/iconv.m4 \
- m4/pkg.m4 \
- m4/po.m4 \
- m4/progtest.m4
+ config/uncrustify.cfg
include libtest/include.am
include libtest/include.am
-include libmemcached/include.am
-include libmemcached/protocol/include.am
-include libmemcached/util/include.am
+
+libtest_libtest_la_DEPENDENCIES+= memcached/memcached
+
+include libhashkit-1.0/include.am
+include libmemcached-1.0/include.am
+include libmemcachedprotocol-0.0/include.am
+include libmemcachedutil-1.0/include.am
+
include clients/include.am
include clients/include.am
-include libhashkit/include.am
-include tests/include.am
+include docs/include.am
include example/include.am
include example/include.am
-include support/include.am
+include libhashkit/include.am
+include libmemcached/include.am
+include libmemcachedutil/include.am
+include libmemcachedprotocol/include.am
+include libmemcachedinternal/include.am
+include libmemcachedinternal/util/include.am
include poll/include.am
include poll/include.am
+include support/include.am
+include tests/include.am
+include util/include.am
include win32/include.am
include win32/include.am
-include
docs
/include.am
+include
memcached
/include.am
docs: html man
docs: html man
@@
-60,7
+67,7
@@
fedora:
@cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
@cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
@cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
@cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
-generic:
+generic:
support/libmemcached.spec
@rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
@rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
@cp libmemcached-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
@rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
@rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
@cp libmemcached-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
@@
-87,6
+94,9
@@
merge-clean:
@find ./ | $(GREP) \.orig | xargs rm -f
@find ./ | $(GREP) \.rej | xargs rm -f
@find ./ | $(GREP) \.rpm | xargs rm -f
@find ./ | $(GREP) \.orig | xargs rm -f
@find ./ | $(GREP) \.rej | xargs rm -f
@find ./ | $(GREP) \.rpm | xargs rm -f
+ @find ./ | $(GREP) \.THIS | xargs rm -f
+ @find ./ | $(GREP) \.OTHER | xargs rm -f
+ @find ./ | $(GREP) \.BASE | xargs rm -f
@find ./ | $(GREP) \~$$ | xargs rm -f
@echo "Files that need to be either removed or checked in:"
@bzr unknowns
@find ./ | $(GREP) \~$$ | xargs rm -f
@echo "Files that need to be either removed or checked in:"
@bzr unknowns