further updates to the build system, generate enigma2.sh

[vuplus_dvbapp] / main / Makefile.am

diff --git a/main/Makefile.am b/main/Makefile.am
index 9f2b118..33bebdf 100644 (file)
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -4,48 +4,51 @@ AM_CPPFLAGS = \
        -include Python.h \
        -include $(top_builddir)/enigma2_config.h
 
+AM_CXXFLAGS = \
+       $(LIBSDL_CFLAGS)
+
 bin_PROGRAMS = enigma2
 
 enigma2_SOURCES = \
-       enigma.cpp bsod.cpp
-
-CLEANFILES = version.h
-
-bsod.o: version.h
-
-enigma.o: version.h
-
-# when there is no ../CVS/Entries, don't worry.
-../CVS/Entries:
+       bsod.cpp \
+       bsod.h \
+       enigma.cpp \
+       version.h
+
+EXTRA_DIST = \
+       enigma-dvbtest.cpp \
+       enigma-gdi.cpp \
+       enigma-gui.cpp \
+       enigma-playlist.cpp \
+       enigma-scan.cpp
 
-../CVS/Root:
-
-.PHONY: .svn/entries
+enigma2_LDADD = \
+       $(top_builddir)/lib/libenigma.la \
+       @BASE_LIBS@ \
+       @LIBGIF_LIBS@ \
+       @LIBJPEG_LIBS@ \
+       @LIBSDL_LIBS@ \
+       @LIBXINE_LIBS@ \
+       @LIBXMLCCWRAP_LIBS@ \
+       @PTHREAD_LIBS@ \
+       @PYTHON_LDFLAGS@
 
-entries: .svn/entries
-       @if [ ! -f entries ]; then touch entries; fi
-       @if [ -f .svn/entries ] && ! diff -q entries .svn/entries 2>/dev/null; then     \
-               cp --no-preserve=mode .svn/entries entries;                             \
-       fi;
+GIT_DIR = $(top_srcdir)/.git
 
-version.h: entries
-       > version.h
-       @if [ -d .svn ]; then \
-               echo "#define ENIGMA2_LAST_CHANGE_DATE \"`LANG="en" svn info | grep 'Last Changed Date:' | cut -d' ' -f4`\"" >> version.h; \
-       elif [ -d ../.git ]; then \
-               if [ -f ../.git/last_commit_info ]; then \
-                       echo "#define ENIGMA2_LAST_CHANGE_DATE \"`cat ../.git/last_commit_info | grep 'Date:' | cut -d' ' -f4`\"" >> version.h; \
-                       echo "#define ENIGMA2_BRANCH \"`cat ../.git/branch`\"" >> version.h; \
+version.h:
+       if [ -d $(GIT_DIR) ]; then \
+               if [ -f $(GIT_DIR)/last_commit_info ]; then \
+                       echo "#define ENIGMA2_LAST_CHANGE_DATE \"`cat $(GIT_DIR)/last_commit_info | grep 'Date:' | cut -d' ' -f4`\"" > $@; \
+                       echo "#define ENIGMA2_BRANCH \"`cat $(GIT_DIR)/branch`\"" >> $@; \
                else \
-                       echo "#define ENIGMA2_LAST_CHANGE_DATE \"`LANG="en" git log --max-count=1 --date=short | grep 'Date:' | cut -d' ' -f4`\"" >> version.h; \
-                       echo "#define ENIGMA2_BRANCH \"`LANG="en" git branch | grep '* ' | cut -d' ' -f2`\"" >> version.h; \
+                       echo "#define ENIGMA2_LAST_CHANGE_DATE \"`git --git-dir=$(top_srcdir)/.git log --no-color -n 1 --format=format:%cd --date=short`\"" > $@; \
+                       echo "#define ENIGMA2_BRANCH \"`git --git-dir=$(top_srcdir)/.git branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'`\"" >> $@; \
                fi; \
+       elif [ ! -f $@ ]; then \
+               echo "#define ENIGMA2_LAST_CHANGE_DATE \"`date --rfc-3339=date`\"" > $@; \
+               echo "#define ENIGMA2_BRANCH \"$(PACKAGE_VERSION)\"" >> $@; \
        fi;
 
-enigma2_LDADD = \
-       $(top_builddir)/lib/libenigma.la \
-       @BASE_LIBS@ \
-       @LIBXINE_LIBS@ \
-       @PTHREAD_LIBS@ \
-       @SDL_LIBS@ \
-       @LIBS@
+dist-hook:
+       echo "#define ENIGMA2_LAST_CHANGE_DATE \"`date --rfc-3339=date`\"" > version.h;
+       echo "#define ENIGMA2_BRANCH \"$(PACKAGE_VERSION)\"" >> version.h;