← 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-21 17:31:14 UTC
  • mto: (1783.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 1784.
  • Revision ID: mordred@inaugust.com-20100921173114-tm5ihlk87gzcxl29
Reverted actually building a drizzled7 binary in the tree. That was silly.
We can take care of this completely at install time.

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_drizzled7_LDFLAGS= -export-dynamic
440
 
drizzled_drizzled7_LDADD= \
 
439
drizzled_drizzled_LDFLAGS= -export-dynamic
 
440
drizzled_drizzled_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_drizzled7_DEPENDENCIES= \
460
 
                                 drizzled/drizzled \
461
 
                                 drizzled/message/libdrizzledmessage.la \
462
 
                                 ${noinst_LTLIBRARIES} \
463
 
                                 $(pandora_plugin_libs)
 
459
drizzled_drizzled_DEPENDENCIES= \
 
460
                                      drizzled/message/libdrizzledmessage.la \
 
461
                                      ${noinst_LTLIBRARIES} \
 
462
                                      $(pandora_plugin_libs)
464
463
 
465
 
drizzled_drizzled7_SOURCES= \
 
464
drizzled_drizzled_SOURCES= \
466
465
                           drizzled/main.cc \
467
466
                                 drizzled/alter_info.cc \
468
467
                                 drizzled/cached_item.cc \
768
767
                                 drizzled/version.cc \
769
768
                                 drizzled/xid.cc
770
769
 
771
 
sbin_PROGRAMS+= drizzled/drizzled7
 
770
sbin_PROGRAMS+= drizzled/drizzled
772
771
 
773
772
noinst_LTLIBRARIES+= \
774
773
                     drizzled/libcached_directory.la \
852
851
             $(nodist_drizzled_SOURCES)
853
852
 
854
853
if DTRACE_NEEDS_OBJECTS
855
 
drizzled_drizzled7_SOURCES+= drizzled/probes.d
 
854
drizzled_drizzled_SOURCES+= drizzled/probes.d
856
855
endif
857
856
 
858
857
if HAVE_DTRACE
862
861
 
863
862
 
864
863
DISTCLEANFILES+= \
865
 
                 drizzled/drizzled \
866
864
                 $(EXTRA_PROGRAMS) \
867
865
                 $(BUILT_MAINT_SRC)
868
866
 
885
883
        $(CXXCOMPILE) -include config.h ${NO_UNUSED_MACROS} -c $<
886
884
endif
887
885
 
888
 
drizzled/drizzled:
889
 
        $(LN_S) drizzled7 drizzled/drizzled
890
 
 
891
886
drizzled/probes.o :  drizzled/probes.d $(DTRACEFILES) config.h
892
887
 
893
888
.d.o: