diff options
| -rwxr-xr-x | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 30 | ||||
| -rw-r--r-- | enigma2.pc.in | 4 | ||||
| -rw-r--r-- | lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am | 3 | ||||
| -rw-r--r-- | main/Makefile.am | 15 |
5 files changed, 33 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am index ab2d1639..ff252e60 100755 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,9 @@ install_PYTHON = \ keyids.py keymapparser.py mytest.py skin.py timer.py tools.py GlobalActions.py \ e2reactor.py +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = enigma2.pc + metadir = $(datadir)/meta meta_DATA = index-enigma2.xml CLEANFILES = index-enigma2.xml diff --git a/configure.ac b/configure.ac index 48fea647..0c54f5bf 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([enigma2],[2.8.0],[enigma2-devel@lists.elitedvb.net]) +AC_INIT([enigma2],[3.0.0],[enigma2-devel@lists.elitedvb.net]) AM_INIT_AUTOMAKE([dist-bzip2 no-define tar-pax -Wno-portability]) AC_CONFIG_HEADERS([enigma2_config.h]) @@ -16,14 +16,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CHECK_HEADERS([dbox/fp.h dbox/lcd-ks0713.h]) -AC_PATH_PROG(MSGFMT,[msgfmt]) -AC_PATH_PROG(MSGINIT,[msginit]) -AC_PATH_PROG(MSGMERGE,[msgmerge]) -AC_PATH_PROG(MSGUNIQ,[msguniq]) -AC_PATH_PROG(XGETTEXT,[xgettext]) -if test -z "$MSGFMT" -o -z "$MSGINIT" -o -z "$MSGMERGE" -o -z "$MSGUNIQ" -o -z "$XGETTEXT"; then - AC_MSG_ERROR([Could not find required gettext tools]) -fi +AC_PATH_PROG(MSGFMT, msgfmt, AC_MSG_ERROR(Could not find msgfmt)) AM_PATH_PYTHON AX_PYTHON_DEVEL @@ -86,12 +79,25 @@ if test "$with_memcheck" = "yes"; then fi AC_ARG_WITH(po, - AS_HELP_STRING([--without-po],[disable updating of po files]), - [with_po="$withval"],[with_po="yes"]) + AS_HELP_STRING([--with-po],[enable updating of po files]), + [with_po="$withval"],[with_po="no"]) +if test "$with_po" = "yes"; then + AC_PATH_PROG(MSGINIT, msginit) + AC_PATH_PROG(MSGMERGE, msgmerge) + AC_PATH_PROG(MSGUNIQ, msguniq) + AC_PATH_PROG(XGETTEXT, xgettext) + if test -z "$MSGINIT" -o -z "$MSGMERGE" -o -z "$MSGUNIQ" -o -z "$XGETTEXT"; then + AC_MSG_ERROR([Could not find required gettext tools]) + fi +fi AM_CONDITIONAL(UPDATE_PO, test "$with_po" = "yes") +ENIGMA2_CFLAGS="-fno-rtti -fno-exceptions" +AC_SUBST(ENIGMA2_CFLAGS) + CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" -CXXFLAGS="$CXXFLAGS $BASE_CFLAGS $PTHREAD_CFLAGS $DEBUG_CFLAGS -fno-rtti -fno-exceptions -Wall" +CFLAGS="$CFLAGS $DEBUG_CFLAGS -Wall" +CXXFLAGS="$CXXFLAGS $DEBUG_CFLAGS -Wall $BASE_CFLAGS $ENIGMA2_CFLAGS $PTHREAD_CFLAGS" AC_CONFIG_FILES([ Makefile diff --git a/enigma2.pc.in b/enigma2.pc.in index 01ba4341..f34d904d 100644 --- a/enigma2.pc.in +++ b/enigma2.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: enigma2 Description: Enigma2 Version: @VERSION@ -Libs: -Cflags: -I${includedir}/enigma2 +Cflags: -I${includedir}/enigma2 @ENIGMA2_CFLAGS@ +Requires.private: sigc++-1.2 diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am index 7aaec9bb..3e2ee67c 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am +++ b/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am @@ -4,6 +4,8 @@ AM_CPPFLAGS = \ -include Python.h \ -include $(top_builddir)/enigma2_config.h +AM_CXXFLAGS = @LIBDDVD_CFLAGS@ + plugindir = $(pkglibdir)/python/Plugins/Extensions/DVDPlayer plugin_LTLIBRARIES = servicedvd.la @@ -13,3 +15,4 @@ servicedvd_la_SOURCES = \ servicedvd.h servicedvd_la_LDFLAGS = -avoid-version -module +servicedvd_la_LIBADD = @LIBDDVD_LIBS@ diff --git a/main/Makefile.am b/main/Makefile.am index bdea2c8b..eadf84e1 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -61,26 +61,25 @@ ENIGMA2_DATE = `cat $(GIT_DIR)/last_commit_info | grep 'Date:' | cut -d' ' -f4` ENIGMA2_COMMIT_DATE = `cat $(GIT_DIR)/last_commit_info | grep 'CommitDate:' | cut -d' ' -f2` ENIGMA2_BRANCH = `cat $(GIT_DIR)/branch` else -ENIGMA2_DATE = ENIGMA2_COMMIT_DATE = `$(GIT) log --no-color -n 1 --pretty=format:%cd --date=short` ENIGMA2_BRANCH = `$(GIT) branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'` ENIGMA2_REV = `$(GIT) describe --abbrev=7 --always --long --tags` endif +endif BUILT_SOURCES = version-intermediate.h .INTERMEDIATE: version-intermediate.h .PHONY: version-intermediate.h version-intermediate.h: $(AM_V_GEN)touch $@ - if [ -n "$(ENIGMA2_COMMIT_DATE)" ]; then \ - $(AM_V_at)[ -n "$(ENIGMA2_COMMIT_DATE)" ] && echo "#define ENIGMA2_LAST_CHANGE_DATE \"$(ENIGMA2_COMMIT_DATE)\"" >> $@; \ - else \ - $(AM_V_at)[ -n "$(ENIGMA2_DATE)" ] && echo "#define ENIGMA2_LAST_CHANGE_DATE \"$(ENIGMA2_DATE)\"" >> $@; \ - fi; - $(AM_V_at)[ -n "$(ENIGMA2_BRANCH)" ] && echo "#define ENIGMA2_BRANCH \"$(ENIGMA2_BRANCH)\"" >> $@ + -$(AM_V_at)if [ -n "$(ENIGMA2_COMMIT_DATE)" ]; then \ + echo "#define ENIGMA2_LAST_CHANGE_DATE \"$(ENIGMA2_COMMIT_DATE)\"" >> $@; \ + elif [ -n "$(ENIGMA2_DATE)" ]; then \ + echo "#define ENIGMA2_LAST_CHANGE_DATE \"$(ENIGMA2_DATE)\"" >> $@; \ + fi + -$(AM_V_at)[ -n "$(ENIGMA2_BRANCH)" ] && echo "#define ENIGMA2_BRANCH \"$(ENIGMA2_BRANCH)\"" >> $@ -$(AM_V_at)[ -n "$(ENIGMA2_REV)" ] && echo "#define ENIGMA2_REV \"$(ENIGMA2_REV)\"" >> $@ $(AM_V_at)([ -f version.h ] && diff -q version.h $@ >/dev/null) || $(INSTALL_HEADER) $@ version.h -endif enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE) $(AM_V_CXXLD)$(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(enigma2_LDFLAGS) $(enigma2_OBJECTS) \ |