Browse Source

* (1/3) cleanup : use $CXXFLAGS instead $CPU_FLAGS

pull/117/head
hagen 10 years ago
parent
commit
4e94bc9efc
  1. 6
      Makefile
  2. 2
      Makefile.linux

6
Makefile

@ -24,16 +24,16 @@ obj:
# weaker rule for building files without headers # weaker rule for building files without headers
obj/%.o : %.cpp obj/%.o : %.cpp
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) $(CPU_FLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -c -o $@ $<
obj/%.o : %.cpp %.h obj/%.o : %.cpp %.h
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) $(CPU_FLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -c -o $@ $<
$(I2PD): $(patsubst %.cpp,obj/%.o,$(DAEMON_SRC)) $(I2PD): $(patsubst %.cpp,obj/%.o,$(DAEMON_SRC))
$(CXX) -o $@ $^ $(LDLIBS) $(LDFLAGS) $(LIBS) $(CXX) -o $@ $^ $(LDLIBS) $(LDFLAGS) $(LIBS)
$(SHLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC)) $(SHLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC))
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) $(CPU_FLAGS) -shared -o $@ $^ $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -shared -o $@ $^
clean: clean:
rm -fr obj $(I2PD) $(SHLIB) rm -fr obj $(I2PD) $(SHLIB)

2
Makefile.linux

@ -34,7 +34,7 @@ ifeq ($(USE_AESNI),yes)
ifeq ($(IS_64),1) ifeq ($(IS_64),1)
#check if AES-NI is supported by CPU #check if AES-NI is supported by CPU
ifneq ($(shell grep -c aes /proc/cpuinfo),0) ifneq ($(shell grep -c aes /proc/cpuinfo),0)
CPU_FLAGS = -maes -DAESNI CXXFLAGS += -maes -DAESNI
endif endif
endif endif
endif endif

Loading…
Cancel
Save