X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=main%2FMakefile.am;h=9f2b11827e0834631c38a149ba78d833abeaef0e;hb=8e1bfdaeba295c6d5f29a306076492d7c70fd5b3;hp=da09c1a27a4b01a1d9c26094a32229be8efa17aa;hpb=ce31b562c29e94d2421e0a2b0257030eca97f1cd;p=vuplus_dvbapp

diff --git a/main/Makefile.am b/main/Makefile.am
index da09c1a..9f2b118 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -1,5 +1,8 @@
-INCLUDES = \
-	-I$(top_srcdir)/include
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-include Python.h \
+	-include $(top_builddir)/enigma2_config.h
 
 bin_PROGRAMS = enigma2
 
@@ -17,46 +20,32 @@ enigma.o: version.h
 
 ../CVS/Root:
 
-# this depends on Entries and not on Tag because Tag isn't always there.
-# Entries, however, will change then Tag is changed, so everything is fine.
-version.h: # ../CVS/Entries ../CVS/Root
+.PHONY: .svn/entries
+
+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;
+
+version.h: entries
 	> version.h
-	if [ -f ../CVS/Tag ]; then echo "#define ENIGMA2_CHECKOUT_TAG \"`cat ../CVS/Tag`\"" >> version.h; fi
-	if [ -f ../CVS/Root ]; then echo "#define ENIGMA2_CHECKOUT_ROOT \"`cat ../CVS/Root`\"" >> version.h; fi
-	if [ -d .svn ]; then echo "#define ENIGMA2_CHECKOUT_TAG \"D`svn info | grep 'Last Changed Date:' | sed -e 's/[^:]*: \(....\)-\(..\)-\(..\) \(..\):\(..\):\(..\).*+.*$$/\1.\2.\3.\4.\5.\6/'`\"" >> version.h; fi
-
-enigma2_LDADD_WHOLE = \
-	$(top_builddir)/lib/actions/libenigma_actions.a \
-	$(top_builddir)/lib/base/libenigma_base.a \
-	$(top_builddir)/lib/components/libenigma_components.a \
-	$(top_builddir)/lib/driver/libenigma_driver.a \
-	$(top_builddir)/lib/mmi/libenigma_mmi.a \
-	$(top_builddir)/lib/dvb/libenigma_dvb.a \
-	$(top_builddir)/lib/dvb_ci/libenigma_dvb_ci.a \
-	$(top_builddir)/lib/gdi/libenigma_gdi.a \
-	$(top_builddir)/lib/gui/libenigma_gui.a \
-	$(top_builddir)/lib/python/libenigma_python.a \
-	$(top_builddir)/lib/nav/libenigma_nav.a \
-	$(top_builddir)/lib/service/libenigma_service.a
+	@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; \
+		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; \
+		fi; \
+	fi;
 
 enigma2_LDADD = \
-	@FREETYPE_LIBS@ \
-	@ID3TAG_LIBS@ \
-	@MAD_LIBS@ \
-	@PNG_LIBS@ \
+	$(top_builddir)/lib/libenigma.la \
+	@BASE_LIBS@ \
+	@LIBXINE_LIBS@ \
+	@PTHREAD_LIBS@ \
 	@SDL_LIBS@ \
-	@SIGC_LIBS@ \
-	@DVBSI_LIBS@ \
-	@FRIBIDI_LIBS@ \
-	@GSTREAMER_LIBS@ \
-	@GSTREAMERPBUTILS_LIBS@ \
-	@JPEG_LIBS@ \
-	@LIBUNGIF_LIBS@ \
-	@XML2_LIBS@ \
-	@XMLCCWRAP_LIBS@ \
-	-ldl -lpthread -lcrypt -lresolv -lrt
-
-enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)
-#	@rm -f enigma2$(EXEEXT)
-	$(CXXLINK) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS)
-#	g++ -o enigma2$(EXEEXT) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS)
+	@LIBS@