← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/include.am

  • Committer: Monty Taylor
  • Date: 2010-09-19 19:29:36 UTC
  • mfrom: (1775.1.6 build)
  • Revision ID: mordred@inaugust.com-20100919192936-n2szuywl1bvysgoq
Rollup of name change, build bug fixes and Patrick's change to re-enable
that test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/include.am
436
436
                              drizzled/visibility.h \
437
437
                              drizzled/xid.h
438
438
 
439
 
drizzled_drizzled_LDFLAGS= -export-dynamic
440
 
drizzled_drizzled_LDADD= \
 
439
drizzled_drizzled7_LDFLAGS= -export-dynamic
 
440
drizzled_drizzled7_LDADD= \
441
441
                                drizzled/algorithm/libhash.la \
442
442
                                drizzled/util/libutil.la \
443
443
                                drizzled/internal/libinternal.la \
456
456
                                $(BOOST_LIBS) \
457
457
                                $(GCOV_LIBS) 
458
458
 
459
 
drizzled_drizzled_DEPENDENCIES= \
460
 
                                      drizzled/message/libdrizzledmessage.la \
461
 
                                      ${noinst_LTLIBRARIES} \
462
 
                                      $(pandora_plugin_libs)
 
459
drizzled_drizzled7_DEPENDENCIES= \
 
460
                                 drizzled/drizzled \
 
461
                                 drizzled/message/libdrizzledmessage.la \
 
462
                                 ${noinst_LTLIBRARIES} \
 
463
                                 $(pandora_plugin_libs)
463
464
 
464
 
drizzled_drizzled_SOURCES= \
 
465
drizzled_drizzled7_SOURCES= \
465
466
                           drizzled/main.cc \
466
467
                                 drizzled/alter_info.cc \
467
468
                                 drizzled/cached_item.cc \
767
768
                                 drizzled/version.cc \
768
769
                                 drizzled/xid.cc
769
770
 
770
 
sbin_PROGRAMS+= drizzled/drizzled
 
771
sbin_PROGRAMS+= drizzled/drizzled7
771
772
 
772
773
noinst_LTLIBRARIES+= \
773
774
                     drizzled/libcached_directory.la \
851
852
             $(nodist_drizzled_SOURCES)
852
853
 
853
854
if DTRACE_NEEDS_OBJECTS
854
 
drizzled_drizzled_SOURCES+= drizzled/probes.d
 
855
drizzled_drizzled7_SOURCES+= drizzled/probes.d
855
856
endif
856
857
 
857
858
if HAVE_DTRACE
861
862
 
862
863
 
863
864
DISTCLEANFILES+= \
 
865
                 drizzled/drizzled \
864
866
                 $(EXTRA_PROGRAMS) \
865
867
                 $(BUILT_MAINT_SRC)
866
868
 
883
885
        $(CXXCOMPILE) -include config.h ${NO_UNUSED_MACROS} -c $<
884
886
endif
885
887
 
 
888
drizzled/drizzled:
 
889
        $(LN_S) drizzled7 drizzled/drizzled
 
890
 
886
891
drizzled/probes.o :  drizzled/probes.d $(DTRACEFILES) config.h
887
892
 
888
893
.d.o: