Fri Aug 29 10:50:46 2008 Google Inc. <opensource@google.com>

	* cmockery: version 0.11
	* Made it possible to specify executable, library and object output
	  directories.

git-svn-id: http://cmockery.googlecode.com/svn/trunk@12 40f4469a-5155-0410-be90-2de3f0bae501

diff --git a/Makefile.am b/Makefile.am
index 274dfc3ac4d389a24feafb4358b3032f4963331f..00007a98155aff2521f840d777116aac032dd636 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,8 @@ docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
 ## This is for HTML and other documentation you want to install.
 ## Add your documentation files (in doc/) in addition to these
 ## top-level boilerplate files.  Also add a TODO file if you have one.
 ## This is for HTML and other documentation you want to install.
 ## Add your documentation files (in doc/) in addition to these
 ## top-level boilerplate files.  Also add a TODO file if you have one.

-dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README doc/index.html
+dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README doc/index.html \
+               windows/makefile

 
 ## The libraries (.so's) you want to install
 lib_LTLIBRARIES =
 
 ## The libraries (.so's) you want to install
 lib_LTLIBRARIES =

diff --git a/Makefile.in b/Makefile.in
index 59fad88dcf3a67d117597fccc3f05fda5a4d024a..4681cc5fff5ad7060d277bc8a6b700c5593f9237 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -263,7 +263,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/src
 googleincludedir = $(includedir)/google
 googleinclude_HEADERS = src/google/cmockery.h
 docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
 googleincludedir = $(includedir)/google
 googleinclude_HEADERS = src/google/cmockery.h
 docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)

-dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README doc/index.html
+dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README doc/index.html \
+               windows/makefile
+

 lib_LTLIBRARIES = libcmockery.la
 TESTS = 
 TESTS_ENVIRONMENT = CMOCKERY_ROOTDIR = $(top_srcdir)
 lib_LTLIBRARIES = libcmockery.la
 TESTS = 
 TESTS_ENVIRONMENT = CMOCKERY_ROOTDIR = $(top_srcdir)


@@ -843,7 +845,7 @@ check-TESTS: $(TESTS)
 distdir: $(DISTFILES)
        $(am__remove_distdir)
        mkdir $(distdir)
 distdir: $(DISTFILES)
        $(am__remove_distdir)
        mkdir $(distdir)

-       $(mkdir_p) $(distdir)/doc $(distdir)/m4 $(distdir)/packages $(distdir)/packages/rpm $(distdir)/src $(distdir)/src/google
+       $(mkdir_p) $(distdir)/doc $(distdir)/m4 $(distdir)/packages $(distdir)/packages/rpm $(distdir)/src $(distdir)/src/google $(distdir)/windows

        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \