From 0c11767dd0ba23d448fde3b21ebe223fdac8c21d Mon Sep 17 00:00:00 2001 From: stewartamiles Date: Tue, 16 Sep 2008 00:20:10 +0000 Subject: [PATCH] Fri Aug 29 10:50:46 2008 Google Inc. * 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 --- Makefile.am | 3 ++- Makefile.in | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 274dfc3..00007a9 100644 --- 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. -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 = diff --git a/Makefile.in b/Makefile.in index 59fad88..4681cc5 100644 --- 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) -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) @@ -843,7 +845,7 @@ check-TESTS: $(TESTS) 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 \ -- 2.7.4