← Back to branch summary

~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-112

« back to all changes in this revision

Viewing changes to drizzled/include.am

  • Committer: Continuous Integration
  • Date: 2012-12-12 09:57:37 UTC
  • mfrom: (2604.1.6 drizzle-7.2)
  • Revision ID: ci@drizzle.org-20121212095737-t4ckonxdslly0fd6
Merge lp:~brianaker/drizzle/boost-update Build: jenkins-Drizzle-Builder-112

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/include.am
522
522
                              drizzled/xid.h
523
523
 
524
524
drizzled_drizzled_LDFLAGS= -export-dynamic
 
525
drizzled_drizzled_LDFLAGS+= $(BOOST_DATE_TIME_LDFLAGS)
 
526
drizzled_drizzled_LDFLAGS+= $(BOOST_FILESYSTEM_LDFLAGS)
 
527
drizzled_drizzled_LDFLAGS+= $(BOOST_IOSTREAMS_LDFLAGS)
 
528
drizzled_drizzled_LDFLAGS+= $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
 
529
drizzled_drizzled_LDFLAGS+= $(BOOST_REGEX_LDFLAGS)
 
530
drizzled_drizzled_LDFLAGS+= $(BOOST_SYSTEM_LDFLAGS)
 
531
drizzled_drizzled_LDFLAGS+= $(BOOST_THREAD_LDFLAGS)
525
532
drizzled_drizzled_LDADD= \
526
533
                                drizzled/algorithm/libhash.la \
527
534
                                drizzled/util/libutil.la \
533
540
                                ${LIBC_P} \
534
541
                                $(pandora_plugin_libs) \
535
542
                                $(LDADD) \
536
 
                                $(LIBUUID) \
537
543
                                $(LIBDL_LIBS) \
538
544
                                $(LTLIBPCRE) \
539
545
                                $(LTLIBPROTOBUF) \
540
546
                                $(LIBTBB) \
541
 
                                $(BOOST_LIBS) \
542
547
                                $(LTLIBAIO) \
543
548
                                $(GCOV_LIBS)
 
549
drizzled_drizzled_LDADD+= @LIBUUID_LDFLAGS@
 
550
drizzled_drizzled_LDADD+= $(BOOST_SYSTEM_LIBS)
544
551
drizzled_drizzled_LDADD+= $(BOOST_DATE_TIME_LIBS)
545
552
drizzled_drizzled_LDADD+= $(BOOST_FILESYSTEM_LIBS)
546
553
drizzled_drizzled_LDADD+= $(BOOST_IOSTREAMS_LIBS)
547
554
drizzled_drizzled_LDADD+= $(BOOST_PROGRAM_OPTIONS_LIBS)
548
555
drizzled_drizzled_LDADD+= $(BOOST_REGEX_LIBS)
549
 
drizzled_drizzled_LDADD+= $(BOOST_SYSTEM_LIBS)
550
556
drizzled_drizzled_LDADD+= $(BOOST_THREAD_LIBS)
551
557
 
 
558
drizzled_drizzled_CXXFLAGS=
 
559
drizzled_drizzled_CXXFLAGS+= $(BOOST_CPPFLAGS)
 
560
 
552
561
drizzled_drizzled_DEPENDENCIES= \
553
 
                                      drizzled/message/libdrizzledmessage.la \
554
 
                                      ${noinst_LTLIBRARIES} \
555
 
                                      $(pandora_plugin_libs)
 
562
                                drizzled/message/libdrizzledmessage.la \
 
563
                                ${noinst_LTLIBRARIES} \
 
564
                                $(pandora_plugin_libs)
556
565
 
557
566
drizzled_drizzled_SOURCES+= \
558
567
                           drizzled/alter_info.cc \