fix non-ascii chars in service reference, follow new config stuff

[enigma2.git] / main / Makefile.am

diff --git a/main/Makefile.am b/main/Makefile.am
index fd536df79eec0d0f2cd4e7f71eb57eef83abc48f..abc71cddf6c83365b377228de220d549472fdd12 100644 (file)
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -1,11 +1,24 @@
 INCLUDES = \
-       -I$(top_srcdir)/include \
-       -I/usr/include/python2.3
+       -I$(top_srcdir)/include
 
 bin_PROGRAMS = enigma2
 
 enigma2_SOURCES = \
-       enigma.cpp 
+       enigma.cpp bsod.cpp
+
+bsod.o: version.h
+
+# when there is no ../CVS/Entries, don't worry.
+../CVS/Entries:
+
+../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
+       > 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
 
 enigma2_LDADD_WHOLE = \
        $(top_builddir)/lib/actions/libenigma_actions.a \
@@ -13,12 +26,11 @@ enigma2_LDADD_WHOLE = \
        $(top_builddir)/lib/components/libenigma_components.a \
        $(top_builddir)/lib/driver/libenigma_driver.a \
        $(top_builddir)/lib/dvb/libenigma_dvb.a \
-       $(top_builddir)/lib/dvb_si/libenigma_dvb_si.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/network/libenigma_network.a \
        $(top_builddir)/lib/service/libenigma_service.a
 
 enigma2_LDADD = \
@@ -27,11 +39,12 @@ enigma2_LDADD = \
        @MAD_LIBS@ \
        @PNG_LIBS@ \
        @SIGC_LIBS@ \
-       @SDL_LIBS@ \
-       @MD5SUM_LIBS@ \
-       -ldl -lpthread -lcrypt -lresolv -lpython2.3
+       @DVBSI_LIBS@ \
+       @FRIBIDI_LIBS@ \
+       @GSTREAMER_LIBS@ \
+       -ldl -lpthread -lcrypt -lresolv
 
 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)
+#      @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)