comparison GNUmakefile @ 111:51d5549a1bdc

Remove the ancient copy and use of Boost lib subset, use standard C++11 smart_ptr instead.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 06 Oct 2014 15:23:36 +0300
parents 2f1ecc1c5f72
children
comparison
equal deleted inserted replaced
110:e9eb768e7d2b 111:51d5549a1bdc
83 83
84 # Options used when compiling and linking Yadex. 84 # Options used when compiling and linking Yadex.
85 # ld is invoked through the C++ compiler so 85 # ld is invoked through the C++ compiler so
86 # LDFLAGS should not contain options that mean 86 # LDFLAGS should not contain options that mean
87 # something to the C++ compiler. 87 # something to the C++ compiler.
88 CXXFLAGS = -g -O3 -W -Wall 88 CXXFLAGS = -g -O3 -W -Wall -std=c++11
89 #CXXFLAGS += -DWHITE_BACKGROUND 89 #CXXFLAGS += -DWHITE_BACKGROUND
90 #LDFLAGS = 90 #LDFLAGS =
91 91
92 # Options used to compile and link the debugging 92 # Options used to compile and link the debugging
93 # targets. Not used by normal end-user targets. 93 # targets. Not used by normal end-user targets.
262 DOC2 = $(addprefix doc/, $(PIX) $(notdir $(DOC2_SRC_HTML) $(DOC2_SRC_MISC))) 262 DOC2 = $(addprefix doc/, $(PIX) $(notdir $(DOC2_SRC_HTML) $(DOC2_SRC_MISC)))
263 263
264 # Misc. other files that must be put in the 264 # Misc. other files that must be put in the
265 # distribution archive. 265 # distribution archive.
266 MISC_FILES = \ 266 MISC_FILES = \
267 boost/boost/config.hpp \
268 boost/boost/config/compiler/borland.hpp \
269 boost/boost/config/compiler/comeau.hpp \
270 boost/boost/config/compiler/common_edg.hpp \
271 boost/boost/config/compiler/compaq_cxx.hpp \
272 boost/boost/config/compiler/gcc.hpp \
273 boost/boost/config/compiler/greenhills.hpp \
274 boost/boost/config/compiler/hp_acc.hpp \
275 boost/boost/config/compiler/intel.hpp \
276 boost/boost/config/compiler/kai.hpp \
277 boost/boost/config/compiler/metrowerks.hpp \
278 boost/boost/config/compiler/mpw.hpp \
279 boost/boost/config/compiler/sgi_mipspro.hpp \
280 boost/boost/config/compiler/sunpro_cc.hpp \
281 boost/boost/config/compiler/vacpp.hpp \
282 boost/boost/config/compiler/visualc.hpp \
283 boost/boost/config/platform/aix.hpp \
284 boost/boost/config/platform/beos.hpp \
285 boost/boost/config/platform/bsd.hpp \
286 boost/boost/config/platform/cygwin.hpp \
287 boost/boost/config/platform/hpux.hpp \
288 boost/boost/config/platform/irix.hpp \
289 boost/boost/config/platform/linux.hpp \
290 boost/boost/config/platform/macos.hpp \
291 boost/boost/config/platform/solaris.hpp \
292 boost/boost/config/platform/win32.hpp \
293 boost/boost/config/posix_features.hpp \
294 boost/boost/config/select_compiler_config.hpp \
295 boost/boost/config/select_platform_config.hpp \
296 boost/boost/config/select_stdlib_config.hpp \
297 boost/boost/config/stdlib/dinkumware.hpp \
298 boost/boost/config/stdlib/libstdcpp3.hpp \
299 boost/boost/config/stdlib/modena.hpp \
300 boost/boost/config/stdlib/msl.hpp \
301 boost/boost/config/stdlib/roguewave.hpp \
302 boost/boost/config/stdlib/sgi.hpp \
303 boost/boost/config/stdlib/stlport.hpp \
304 boost/boost/config/stdlib/vacpp.hpp \
305 boost/boost/config/suffix.hpp \
306 boost/boost/config/user.hpp \
307 boost/boost/smart_ptr.hpp \
308 boost/boost/static_assert.hpp \
309 boost/boost/utility.hpp \
310 boost/boost/utility/base_from_member.hpp \
311 boost/boost/utility_fwd.hpp \
312 cache/copyright.man \ 267 cache/copyright.man \
313 cache/copyright.txt \ 268 cache/copyright.txt \
314 cache/pixlist \ 269 cache/pixlist \
315 cache/srcdate \ 270 cache/srcdate \
316 cache/uptodate \ 271 cache/uptodate \
731 686
732 src/config.h: $(OBJDIR)/config.h 687 src/config.h: $(OBJDIR)/config.h
733 cp -p $< $@ 688 cp -p $< $@
734 689
735 $(OBJDIR)/%.o: src/%.cc 690 $(OBJDIR)/%.o: src/%.cc
736 $(CXX) -c -Iatclib -Iboost -I$(X11INCLUDEDIR) $(CXXFLAGS) $< -o $@ 691 $(CXX) -c -Iatclib -I$(X11INCLUDEDIR) $(CXXFLAGS) $< -o $@
737 692
738 $(DOBJDIR)/%.o: src/%.cc 693 $(DOBJDIR)/%.o: src/%.cc
739 $(CXX) -c -Iatclib -Iboost -I$(X11INCLUDEDIR) $(DCXXFLAGS) $< -o $@ 694 $(CXX) -c -Iatclib -I$(X11INCLUDEDIR) $(DCXXFLAGS) $< -o $@
740 695
741 # To compile the modules of Atclib 696 # To compile the modules of Atclib
742 # (normal and debugging versions) 697 # (normal and debugging versions)
743 $(OBJDIR_ATCLIB)/%.o: atclib/%.c $(HEADERS_ATCLIB) 698 $(OBJDIR_ATCLIB)/%.o: atclib/%.c $(HEADERS_ATCLIB)
744 $(CC) -c $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ 699 $(CC) -c $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@
747 $(CC) -c $(DCFLAGS) $(EXTRA_CFLAGS) $< -o $@ 702 $(CC) -c $(DCFLAGS) $(EXTRA_CFLAGS) $< -o $@
748 703
749 # To see the generated assembly code 704 # To see the generated assembly code
750 # for the modules of Yadex 705 # for the modules of Yadex
751 $(OBJDIR)/%.S: src/%.cc $(MAKEFILE) 706 $(OBJDIR)/%.S: src/%.cc $(MAKEFILE)
752 $(CXX) $(CXXFLAGS) $(EXTRA_CXXFLAGS) -S -fverbose-asm -Iatclib -Iboost -I$(X11INCLUDEDIR)\ 707 $(CXX) $(CXXFLAGS) $(EXTRA_CXXFLAGS) -S -fverbose-asm -Iatclib -I$(X11INCLUDEDIR)\
753 $< -o $@ 708 $< -o $@
754 709
755 # A source file containing the credits 710 # A source file containing the credits
756 src/credits.cc: $(MAKEFILE) docsrc/copyright scripts/copyright 711 src/credits.cc: $(MAKEFILE) docsrc/copyright scripts/copyright
757 @echo Generating $@ 712 @echo Generating $@