diff options
| author | Milan Crha <mcrha@redhat.com> | 2009-10-02 23:22:59 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2009-10-02 23:22:59 +0800 |
| commit | 6fced70ee07656daf73bf13cab658bf4c2a6baac (patch) | |
| tree | 8cc4db48adb4c4557df52de0f9e835d59a982b5e | |
| parent | cdd5f2c71152dcbc13c98f67914d30918b5791ee (diff) | |
| download | gsoc2013-evolution-6fced70ee07656daf73bf13cab658bf4c2a6baac.tar.gz gsoc2013-evolution-6fced70ee07656daf73bf13cab658bf4c2a6baac.tar.zst gsoc2013-evolution-6fced70ee07656daf73bf13cab658bf4c2a6baac.zip | |
No IDL from eds and server.mk file in evo sources any more
Fixes build with latest eds master (after dbus-cal merge).
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 20 | ||||
| -rw-r--r-- | server.mk | 9 |
3 files changed, 0 insertions, 30 deletions
diff --git a/Makefile.am b/Makefile.am index 41955fe59b..cc508d1257 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,6 @@ EXTRA_DIST = \ marshal.mk \ iconv-detect.c \ plugin.mk \ - server.mk \ intltool-merge.in \ intltool-update.in \ intltool-extract.in \ diff --git a/configure.ac b/configure.ac index f937be9484..7838853424 100644 --- a/configure.ac +++ b/configure.ac @@ -1430,15 +1430,6 @@ AC_DEFINE_UNQUOTED(DATASERVER_VERSION, "`${PKG_CONFIG} --modversion evolution-da DATASERVER_EXEC_VERSION=`${PKG_CONFIG} --variable=execversion evolution-data-server-1.2` AC_SUBST(DATASERVER_EXEC_VERSION) -AC_MSG_CHECKING([for evolution-data-server IDL]) -DATASERVER_IDL=`${PKG_CONFIG} --variable=idldir evolution-data-server-1.2`/Evolution-DataServer.idl -if test -f "$DATASERVER_IDL"; then - AC_MSG_RESULT([$DATASERVER_IDL]) - AC_SUBST(DATASERVER_IDL) -else - AC_MSG_ERROR([no]) -fi - dnl ********** dnl Test Flags dnl ********** @@ -1545,17 +1536,6 @@ privconduitdir='${libdir}'/evolution/$BASE_VERSION/conduits AC_SUBST(privconduitdir) dnl ************************ -dnl IDL/Component Versioning -dnl ************************ - -INTERFACE_VERSION="$BASE_VERSION" -AC_SUBST(INTERFACE_VERSION) -AC_DEFINE_UNQUOTED(INTERFACE_VERSION, "$INTERFACE_VERSION", [IDL interface version (Major.Minor)]) - -EVO_SERVER_RULE=$srcdir/server.mk -AC_SUBST_FILE(EVO_SERVER_RULE) - -dnl ************************ dnl Plugins dnl ************************ diff --git a/server.mk b/server.mk deleted file mode 100644 index 7796708fda..0000000000 --- a/server.mk +++ /dev/null @@ -1,9 +0,0 @@ -%.server.in: %.server.in.in $(top_builddir)/config.h - sed -e 's|\@BINDIR_IN_SERVER_FILE\@|$(bindir_in_server_file)|' \ - -e 's|\@PRIVLIBEXECDIR_IN_SERVER_FILE\@|$(privlibexecdir_in_server_file)|' \ - -e 's|\@COMPONENTDIR_IN_SERVER_FILE\@|$(componentdir_in_server_file)|' \ - -e 's|\@VERSION\@|$(BASE_VERSION)|' \ - -e 's|\@EXEEXT\@|$(EXEEXT)|' \ - -e 's|\@SOEXT\@|$(SOEXT)|' \ - -e 's|\@INTERFACE_VERSION\@|$(INTERFACE_VERSION)|' $< > $@ - |