← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/Makefile.am

  • Committer: Jay Pipes
  • Date: 2009-08-20 17:27:08 UTC
  • mfrom: (1093.9.22 pandora-build)
  • mto: This revision was merged to the branch mainline in revision 1120.
  • Revision ID: jpipes@serialcoder-20090820172708-48n4zi60lviywqj7
Merge and resolve conflicts on pandora build fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/Makefile.am
381
381
 
382
382
drizzled_LDADD = ${noinst_LTLIBRARIES} \
383
383
                 $(top_builddir)/drizzled/message/libdrizzledmessage.la \
384
 
                 $(drizzled_plugin_libs) \
 
384
                 $(pandora_plugin_libs) \
385
385
                 $(LDADD) $(LIBUUID) ${top_builddir}/gnulib/libgnu.la \
386
386
                 $(LIBDL_LIBS) $(LIBPROTOBUF) $(LIBPCRE) $(LIBTBB) \
387
 
                 $(DRIZZLED_PLUGIN_DEP_LIBS)
388
 
drizzled_DEPENDENCIES= ${noinst_LTLIBRARIES} $(drizzled_plugin_libs)
 
387
                 $(PANDORA_PLUGIN_DEP_LIBS)
 
388
drizzled_DEPENDENCIES= ${noinst_LTLIBRARIES} $(pandora_plugin_libs)
389
389
 
390
390
drizzled_LDFLAGS =
391
391