← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/include.am

  • Committer: lbieber
  • Date: 2010-09-17 01:47:05 UTC
  • mfrom: (1770.1.2 build)
  • Revision ID: lbieber@orisndriz08-20100917014705-zzqek5l4x962z5tg
Merge Stewart - remove the unbalanced my_end() call from drizzledump
Merge Stewart - move math functions into plugin

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/include.am
107
107
                              drizzled/function/math/int_divide.h \
108
108
                              drizzled/function/math/int_val.h \
109
109
                              drizzled/function/math/integer.h \
 
110
                              drizzled/function/math/ln.h \
110
111
                              drizzled/function/math/minus.h \
111
112
                              drizzled/function/math/mod.h \
112
113
                              drizzled/function/math/multiply.h \
115
116
                              drizzled/function/math/plus.h \
116
117
                              drizzled/function/math/real.h \
117
118
                              drizzled/function/math/round.h \
 
119
                              drizzled/function/math/sqrt.h \
118
120
                              drizzled/function/math/tan.h \
119
121
                              drizzled/function/min_max.h \
120
122
                              drizzled/function/num1.h \
436
438
                              drizzled/visibility.h \
437
439
                              drizzled/xid.h
438
440
 
439
 
drizzled_drizzled7_LDFLAGS= -export-dynamic
440
 
drizzled_drizzled7_LDADD= \
 
441
drizzled_drizzled_LDFLAGS= -export-dynamic
 
442
drizzled_drizzled_LDADD= \
441
443
                                drizzled/algorithm/libhash.la \
442
444
                                drizzled/util/libutil.la \
443
445
                                drizzled/internal/libinternal.la \
456
458
                                $(BOOST_LIBS) \
457
459
                                $(GCOV_LIBS) 
458
460
 
459
 
drizzled_drizzled7_DEPENDENCIES= \
460
 
                                 drizzled/drizzled \
461
 
                                 drizzled/message/libdrizzledmessage.la \
462
 
                                 ${noinst_LTLIBRARIES} \
463
 
                                 $(pandora_plugin_libs)
 
461
drizzled_drizzled_DEPENDENCIES= \
 
462
                                      drizzled/message/libdrizzledmessage.la \
 
463
                                      ${noinst_LTLIBRARIES} \
 
464
                                      $(pandora_plugin_libs)
464
465
 
465
 
drizzled_drizzled7_SOURCES= \
 
466
drizzled_drizzled_SOURCES= \
466
467
                           drizzled/main.cc \
467
468
                                 drizzled/alter_info.cc \
468
469
                                 drizzled/cached_item.cc \
516
517
                                 drizzled/function/math/int_divide.cc \
517
518
                                 drizzled/function/math/int_val.cc \
518
519
                                 drizzled/function/math/integer.cc \
 
520
                                 drizzled/function/math/ln.cc \
519
521
                                 drizzled/function/math/minus.cc \
520
522
                                 drizzled/function/math/mod.cc \
521
523
                                 drizzled/function/math/multiply.cc \
524
526
                                 drizzled/function/math/plus.cc \
525
527
                                 drizzled/function/math/real.cc \
526
528
                                 drizzled/function/math/round.cc \
 
529
                                 drizzled/function/math/sqrt.cc \
527
530
                                 drizzled/function/math/tan.cc \
528
531
                                 drizzled/function/min_max.cc \
529
532
                                 drizzled/function/num1.cc \
646
649
                                 drizzled/my_getsystime.cc \
647
650
                                 drizzled/my_hash.cc \
648
651
                                 drizzled/name_resolution_context_state.cc \
649
 
                                 drizzled/named_savepoint.cc \
650
652
                                 drizzled/natural_join_column.cc \
651
653
                                 drizzled/optimizer/access_method/const.cc \
652
654
                                 drizzled/optimizer/access_method/index.cc \
768
770
                                 drizzled/version.cc \
769
771
                                 drizzled/xid.cc
770
772
 
771
 
sbin_PROGRAMS+= drizzled/drizzled7
 
773
sbin_PROGRAMS+= drizzled/drizzled
772
774
 
773
775
noinst_LTLIBRARIES+= \
774
776
                     drizzled/libcached_directory.la \
852
854
             $(nodist_drizzled_SOURCES)
853
855
 
854
856
if DTRACE_NEEDS_OBJECTS
855
 
drizzled_drizzled7_SOURCES+= drizzled/probes.d
 
857
drizzled_drizzled_SOURCES+= drizzled/probes.d
856
858
endif
857
859
 
858
860
if HAVE_DTRACE
862
864
 
863
865
 
864
866
DISTCLEANFILES+= \
865
 
                 drizzled/drizzled \
866
867
                 $(EXTRA_PROGRAMS) \
867
868
                 $(BUILT_MAINT_SRC)
868
869
 
885
886
        $(CXXCOMPILE) -include config.h ${NO_UNUSED_MACROS} -c $<
886
887
endif
887
888
 
888
 
drizzled/drizzled:
889
 
        $(LN_S) drizzled7 drizzled/drizzled
890
 
 
891
889
drizzled/probes.o :  drizzled/probes.d $(DTRACEFILES) config.h
892
890
 
893
891
.d.o: