You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@trafficserver.apache.org by an...@apache.org on 2010/05/14 00:11:07 UTC

svn commit: r944031 - /trafficserver/traffic/branches/UserFiber/Makefile

Author: andrewhsu
Date: Thu May 13 22:11:07 2010
New Revision: 944031

URL: http://svn.apache.org/viewvc?rev=944031&view=rev
Log:
TS-349 cleaned up Makefile

Enters 'src' dir to build library before trying to build final binary.

Modified:
    trafficserver/traffic/branches/UserFiber/Makefile

Modified: trafficserver/traffic/branches/UserFiber/Makefile
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/UserFiber/Makefile?rev=944031&r1=944030&r2=944031&view=diff
==============================================================================
--- trafficserver/traffic/branches/UserFiber/Makefile (original)
+++ trafficserver/traffic/branches/UserFiber/Makefile Thu May 13 22:11:07 2010
@@ -1,14 +1,18 @@
-CPP=c++
-BUILD_FLAGS=-g -O3 -Wall -DPIPE_NOT_EFD -Wno-deprecated
-ARCH=x86-64
+CXXFLAGS=-g -O3 -Wall -Wno-deprecated -march=x86-64
+CPPFLAGS=-DPIPE_NOT_EFD -I./include
+LDFLAGS=-L./lib -lUF -lpthread
 
-all:	ufHTTPServer
+.PHONY: all clean lib
 
-ufHTTPServer.o:	ufHTTPServer.C lib/libUF.a
-	$(CPP) $(BUILD_FLAGS) -c -I./include -o ufHTTPServer.o ufHTTPServer.C -march=$(ARCH)
+all: ufHTTPServer
 
-ufHTTPServer:	ufHTTPServer.o
-	$(CPP) $(BUILD_FLAGS) -o ufHTTPServer ufHTTPServer.o -L./lib -lUF -lpthread -march=$(ARCH)
+lib:
+	$(MAKE) -C src all
+
+ufHTTPServer:	lib ufHTTPServer.C
+	$(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) ufHTTPServer.C $(LDFLAGS)
 
 clean: 
-	rm *.o ufHTTPServer
+	$(MAKE) -C src clean
+	$(RM) *.o ufHTTPServer
+