svn commit: r901036 - /incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am

[jp...@apache.org]

Author: jplevyak
Date: Wed Jan 20 02:36:51 2010
New Revision: 901036

URL: http://svn.apache.org/viewvc?rev=901036&view=rev
Log:
TS-75: unify the CPPFLAGS so that only one version of objects
are built.  This addresses duplicate .o files and may address
some of the dependency issues.

Modified:
    incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am

Modified: incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am?rev=901036&r1=901035&r2=901036&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am Wed Jan 20 02:36:51 2010
@@ -19,7 +19,11 @@
   -I$(srcdir)/mgmt2/preparse \
   -I$(srcdir)/mgmt2/utils \
   -I$(srcdir)/mgmt2/web2 \
-  -I$(srcdir)/api/include
+  -I$(srcdir)/api/include \
+  -DPKGLOGDIR=\"$(pkglogdir)\" \
+  -DPREFIX=\"$(prefix)\" \
+  -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
+  -DPKGLOCALSTATEDIR=\"$(pkglocalstatedir)\"
 
 bin_PROGRAMS = \
   traffic_server \
@@ -53,12 +57,6 @@
 
 EXTRA_DIST = InkAPITestTool.cc
 
-traffic_server_CPPFLAGS = \
-  -DPREFIX=\"$(prefix)\" \
-  -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-  -DPKGLOCALSTATEDIR=\"$(pkglocalstatedir)\" \
-  $(AM_CPPFLAGS)
-
 traffic_server_SOURCES = \
   AbstractBuffer.cc \
   AbstractBuffer.h \
@@ -214,9 +212,6 @@
   @LIBREGEX@ @LIBDB@ @LIBSSL@ @LIBTCL@ @LIBDL@ @LIBEV@ \
   @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ -lm
 
-logstats_CPPFLAGS = \
-  -DPKGLOGDIR=\"$(pkglogdir)\" \
-  $(AM_CPPFLAGS)
 logstats_SOURCES = logstats.cc
 logstats_LDFLAGS = @EXTRA_CXX_LDFLAGS@
 logstats_LDADD = \