You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/25 19:09:36 UTC

svn commit: r948115 - in /trafficserver/traffic/trunk: INSTALL Makefile.am

Author: mturk
Date: Tue May 25 17:09:36 2010
New Revision: 948115

URL: http://svn.apache.org/viewvc?rev=948115&view=rev
Log:
TS-373: Move examples to a different make targets

Modified:
    trafficserver/traffic/trunk/INSTALL
    trafficserver/traffic/trunk/Makefile.am

Modified: trafficserver/traffic/trunk/INSTALL
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/INSTALL?rev=948115&r1=948114&r2=948115&view=diff
==============================================================================
--- trafficserver/traffic/trunk/INSTALL (original)
+++ trafficserver/traffic/trunk/INSTALL Tue May 25 17:09:36 2010
@@ -51,6 +51,12 @@ APACHE TRAFFIC SERVER INSTALLATION
          * The easiest way to find all of the configuration flags
            for Traffic Server is to run ./configure --help.
 
+         * To build the examples in example directory use
+           $ make examples
+           To installl the examples inside current layout libexecdir
+           use the
+           $ sudo examples install
+
   Postscript
   ----------
 

Modified: trafficserver/traffic/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/Makefile.am?rev=948115&r1=948114&r2=948115&view=diff
==============================================================================
--- trafficserver/traffic/trunk/Makefile.am (original)
+++ trafficserver/traffic/trunk/Makefile.am Tue May 25 17:09:36 2010
@@ -22,16 +22,16 @@
 ACLOCAL_AMFLAGS = -I build
 
 if STANDALONE_IOCORE
-SUBDIRS =  libinktomi++ librecords iocore @hdr_dirs@ proxy example
+SUBDIRS =  libinktomi++ librecords iocore @hdr_dirs@ proxy
 else
-SUBDIRS =  libinktomi++ librecords iocore proxy example doc rc
+SUBDIRS =  libinktomi++ librecords iocore proxy doc rc
 endif
 
 DIST_BUILD_USER=`id -nu`
 DIST_BUILD_USER_GROUP=`id -ng`
 DISTCHECK_CONFIGURE_FLAGS=--with-user=${DIST_BUILD_USER} --with-group=${DIST_BUILD_USER_GROUP}
 
-EXTRA_DIST=CHANGES INSTALL STATUS NOTICE LICENSE example contrib README.libev README-EC2 REVIEWERS
+EXTRA_DIST=CHANGES INSTALL STATUS NOTICE LAYOUT LICENSE example contrib README.libev README-EC2 REVIEWERS
 
 installcheck-local:
 	$(DESTDIR)$(bindir)/traffic_server -R 1
@@ -55,18 +55,26 @@ asf-dist-sign: asf-dist
 	sha1sum -b $(distdir).tar.bz2 >$(distdir).tar.bz2.sha1
 	gpg --armor --output $(distdir).tar.bz2.asc  --detach-sig $(distdir).tar.bz2
 
+examples: all
+	@(cd example; $(MAKE))
+
+install-examples: examples
+	@(cd example; $(MAKE) install pkglibdir=$(pkglibexecdir))
+
 help:
-	@echo 'all            default target for building the package' && \
-   echo 'check          run the test suite, if any' && \
-   echo 'clean          remove whatever make created' && \
-   echo 'distclean      remove whatever configure created' && \
-   echo 'dist           DEPRECATED: recreate source package' && \
-   echo 'asf-dist       recreate source package' && \
-   echo 'asf-dist-sign  recreate source package, with checksums and signature' && \
-   echo 'distcheck      verify dist by performing VPATH build and then distclean' && \
-   echo 'doxygen        generate doxygen docs in doc/html dir' && \
-   echo 'help           display this list of make targets' && \
-   echo 'install        install by copying the built files to system-wide dirs' && \
-   echo 'install-strip  same as install but then strips debugging symbols' && \
-   echo 'uninstall      opposite of install, removes installed files'
+	@echo 'all              default target for building the package' && \
+   echo 'check            run the test suite, if any' && \
+   echo 'clean            remove whatever make created' && \
+   echo 'distclean        remove whatever configure created' && \
+   echo 'dist             DEPRECATED: recreate source package' && \
+   echo 'examples         make examples' && \
+   echo 'asf-dist         recreate source package' && \
+   echo 'asf-dist-sign    recreate source package, with checksums and signature' && \
+   echo 'distcheck        verify dist by performing VPATH build and then distclean' && \
+   echo 'doxygen          generate doxygen docs in doc/html dir' && \
+   echo 'help             display this list of make targets' && \
+   echo 'install          install by copying the built files to system-wide dirs' && \
+   echo 'install-strip    same as install but then strips debugging symbols' && \
+   echo 'install-examples install examples by copying the built files to system-wide dirs' && \
+   echo 'uninstall        opposite of install, removes installed files'