Makefile.unix: allow CXXFLAGS to be easily overridden

separate out required flags allowing CXXFLAGS to append them

Change-Id: I2ecd68c7c153da5f17e3b53e1c8ae4e739c65f4c
This commit is contained in:
James Zern 2016-03-22 20:55:33 -07:00
parent 4ff5785938
commit 918440adaf

View File

@ -1,7 +1,8 @@
CXX := g++ CXX := g++
DEFINES := -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS DEFINES := -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
INCLUDES := -I. INCLUDES := -I.
CXXFLAGS := -W -Wall -g -MMD -MP $(DEFINES) $(INCLUDES) CXXFLAGS := -W -Wall -g
ALL_CXXFLAGS := -MMD -MP $(DEFINES) $(INCLUDES) $(CXXFLAGS)
LIBWEBMA := libwebm.a LIBWEBMA := libwebm.a
LIBWEBMSO := libwebm.so LIBWEBMSO := libwebm.so
WEBMOBJS := mkvmuxer/mkvmuxer.o mkvmuxer/mkvmuxerutil.o mkvmuxer/mkvwriter.o WEBMOBJS := mkvmuxer/mkvmuxer.o mkvmuxer/mkvmuxerutil.o mkvmuxer/mkvwriter.o
@ -38,14 +39,14 @@ libwebm.a: $(OBJSA)
$(AR) rcs $@ $^ $(AR) rcs $@ $^
libwebm.so: $(OBJSSO) libwebm.so: $(OBJSSO)
$(CXX) $(CXXFLAGS) -shared $(OBJSSO) -o $(LIBWEBMSO) $(CXX) $(ALL_CXXFLAGS) -shared $(OBJSSO) -o $(LIBWEBMSO)
%.o: %.cc %.o: %.cc
$(CXX) -c $(CXXFLAGS) $< -o $@ $(CXX) -c $(ALL_CXXFLAGS) $< -o $@
%_a.o: %.cc %_a.o: %.cc
$(CXX) -c $(CXXFLAGS) $< -o $@ $(CXX) -c $(ALL_CXXFLAGS) $< -o $@
%_so.o: %.cc %_so.o: %.cc
$(CXX) -c $(CXXFLAGS) -fPIC $< -o $@ $(CXX) -c $(ALL_CXXFLAGS) -fPIC $< -o $@
clean: clean:
$(RM) -f $(CLEAN) Makefile.bak $(RM) -f $(CLEAN) Makefile.bak