← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/Makefile.am

  • Committer: Monty Taylor
  • Date: 2008-12-20 23:44:07 UTC
  • mto: (722.2.2 devel)
  • mto: This revision was merged to the branch mainline in revision 727.
  • Revision ID: monty@inaugust.com-20081220234407-585wdrdd1vxqqzam
Removed all the setting of DEFS everywhere. Use configmake.h to get the values
we need.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/Makefile.am
13
13
#  along with this program; if not, write to the Free Software
14
14
#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
15
15
 
16
 
MYSQLDATAdir =$(localstatedir)
17
 
 
18
 
MYSQLSHAREdir =$(pkgdatadir)
19
 
 
20
 
MYSQLBASEdir=$(prefix)
21
 
 
22
 
MYSQLLIBdir=            $(pkglibdir)
23
 
 
24
 
pkgplugindir =$(pkglibdir)/plugin
25
16
 
26
17
sbin_PROGRAMS= drizzled
27
18
 
57
48
                current_session.h \
58
49
                common.h \
59
50
                comp_creator.h \
60
 
                configmake.h \
61
51
                connect.h \
62
52
                cost_vect.h \
63
53
                data_home.h \
706
696
                function/time/yearweek.cc
707
697
 
708
698
 
709
 
 
710
 
DEFS =-DDRIZZLE_SERVER \
711
 
      -DDEFAULT_DRIZZLE_HOME="\"$(MYSQLBASEdir)\"" \
712
 
      -DDATADIR="\"$(MYSQLDATAdir)\"" \
713
 
      -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
714
 
      -DPLUGINDIR="\"$(pkgplugindir)\"" \
715
 
      -DLOCALEDIR=\"$(localedir)\" \
716
 
      @DEFS@
717
 
 
718
699
if BUILD_GCC_PCH
719
700
PCHHEADERS = \
720
701
                definitions.h.gch \
733
714
 
734
715
BUILT_SOURCES = $(BUILT_MAINT_SRC) \
735
716
                lex_hash.h \
736
 
                configmake.h \
737
717
                $(PCHHEADERS)
738
718
 
739
719
EXTRA_DIST = \
767
747
        sed "s/#include <unistd.h>//g" probes.h.bak > probes.h
768
748
        rm probes.h.bak
769
749
 
770
 
configmake.h: Makefile
771
 
        @rm -f $@-t $@
772
 
        @{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
773
 
          echo '#define PREFIX "$(prefix)"'; \
774
 
          echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
775
 
          echo '#define BINDIR "$(bindir)"'; \
776
 
          echo '#define SBINDIR "$(sbindir)"'; \
777
 
          echo '#define LIBEXECDIR "$(libexecdir)"'; \
778
 
          echo '#define DATAROOTDIR "$(datarootdir)"'; \
779
 
          echo '#define DATADIR "$(datadir)"'; \
780
 
          echo '#define SYSCONFDIR "$(sysconfdir)"'; \
781
 
          echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
782
 
          echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
783
 
          echo '#define INCLUDEDIR "$(includedir)"'; \
784
 
          echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
785
 
          echo '#define DOCDIR "$(docdir)"'; \
786
 
          echo '#define INFODIR "$(infodir)"'; \
787
 
          echo '#define HTMLDIR "$(htmldir)"'; \
788
 
          echo '#define DVIDIR "$(dvidir)"'; \
789
 
          echo '#define PDFDIR "$(pdfdir)"'; \
790
 
          echo '#define PSDIR "$(psdir)"'; \
791
 
          echo '#define LIBDIR "$(libdir)"'; \
792
 
          echo '#define LISPDIR "$(lispdir)"'; \
793
 
          echo '#define LOCALEDIR "$(localedir)"'; \
794
 
          echo '#define MANDIR "$(mandir)"'; \
795
 
          echo '#define MANEXT "$(manext)"'; \
796
 
          echo '#define PKGDATADIR "$(pkgdatadir)"'; \
797
 
          echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
798
 
          echo '#define PKGLIBDIR "$(pkglibdir)"'; \
799
 
          echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
800
 
        } | sed '/""/d' > $@-t
801
 
        if diff $@-t $@ >/dev/null 2>&1 ; then \
802
 
          rm @-t ; \
803
 
        else \
804
 
          mv $@-t $@ ; \
805
 
        fi
806
 
 
807
750
 
808
751
SUFFIXES = .d .gch
809
752