ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/zoe/trunk/GNUmakefile
(Generate patch)

Comparing trunk/GNUmakefile (file contents):
Revision 40 by douglas, 2004-07-21T20:43:31-07:00 vs.
Revision 41 by douglas, 2004-08-03T23:36:11-07:00

# Line 12 | Line 12 | cxxsrc = Zoe.cpp AwayMessage.cpp Buddy.c
12          $(menes)/menes-app/c++/fatality.cpp $(menes)/menes-app/arguments.cpp \
13          $(menes)/menes-ext/uuid.cpp $(menes)/menes-log/logging.cpp $(wildcard \
14          $(foreach prj, api/devrandom api/execinfo api/mhash api/posix api/pthread \
15 <                api/proc api/libuuid dbi dbi/pgsql ios net/oscar net/oscar/tools xml, \
16 <                $(menes)/menes-$(prj)/*.cpp))
15 >                api/proc api/libuuid dbi dbi/mysql dbi/pgsql ios net/oscar \
16 >                net/oscar/tools xml, $(menes)/menes-$(prj)/*.cpp))
17   cxxhdr = $(patsubst %.cpp, %.hpp, ${cxxsrc})
18   cxxobj = $(patsubst %.cpp, object/%.o, ${cxxsrc})
19   cxxdep = $(patsubst %.cpp, object/%.d, ${cxxsrc})
# Line 23 | Line 23 | ifeq (FreeBSD,$(shell uname))
23   CXX := g++34
24   endif
25   CXXFLAGS := -g -O0
26 < CPPFLAGS += -DNFINLINE -DNPROFILE -I$(menes) -DMENES_NO_MYSQL
27 < LDFLAGS += -pthread
28 < LDLIBS += -lexecinfo -lmhash -lpcre -lpq -luuid
26 > CPPFLAGS += -DNFINLINE -DNPROFILE -I$(menes)
27 > LDFLAGS += -pthread -L/usr/local/lib/mysql
28 > LDLIBS += -lexecinfo -lmhash -lmysqlclient_r -lpcre -lpq -luuid
29  
30   all: ${exe}
31  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines