mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd synced 2024-11-10 08:00:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #148 from Nefelim4ag/master

Browse Source 
Makefile fixes
This commit is contained in:
orignal 2015-01-13 11:26:05 -05:00
commit a3352ac1dc
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -25,7 +25,7 @@ endif
all: mk_build_dir $(SHLIB) $(I2PD) all: mk_build_dir $(SHLIB) $(I2PD)
mk_build_dir: mk_build_dir:
test -d obj || mkdir obj mkdir -p obj
api: $(SHLIB) api: $(SHLIB)
@ -37,12 +37,12 @@ api: $(SHLIB)
## custom FLAGS to work at build-time. ## custom FLAGS to work at build-time.
deps: deps:
@test -d obj || mkdir obj @mkdir -p obj
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) -MM *.cpp > $(DEPS) $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) -MM *.cpp > $(DEPS)
@sed -i -e '/\.o:/ s/^/obj\//' $(DEPS) @sed -i -e '/\.o:/ s/^/obj\//' $(DEPS)
obj/%.o : %.cpp obj/%.o : %.cpp
@test -d obj || mkdir obj @mkdir -p obj
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) $(CPU_FLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) $(CPU_FLAGS) -c -o $@ $<
# '-' is 'ignore if missing' on first run # '-' is 'ignore if missing' on first run

4
Makefile.linux
View File

@ -1,4 +1,4 @@
CXXFLAGS = -g -Wall -fPIC CXXFLAGS = -g -Wall
INCFLAGS = INCFLAGS =
## NOTE: The NEEDED_CXXFLAGS are here so that custom CXXFLAGS can be specified at build time ## NOTE: The NEEDED_CXXFLAGS are here so that custom CXXFLAGS can be specified at build time
@ -22,6 +22,8 @@ else # not supported
$(error Compiler too old) $(error Compiler too old)
endif endif
NEEDED_CXXFLAGS += -fPIC
ifeq ($(USE_STATIC),yes) ifeq ($(USE_STATIC),yes)
LIBDIR := /usr/lib LIBDIR := /usr/lib
LDLIBS = $(LIBDIR)/libboost_system.a LDLIBS = $(LIBDIR)/libboost_system.a