X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=main%2FMakefile.am;h=4eebe99612394b97f6a1466ee873f4e47a5e9d4a;hp=4f26387e09cbd7f8063e9259acf3b3160f19e679;hb=97b86324d322309843cc5d9d93b039d706c5ae58;hpb=9c998a40679f9b630ccf8cc6fda7384ce94c30e5

diff --git a/main/Makefile.am b/main/Makefile.am
index 4f26387..4eebe99 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -1,5 +1,7 @@
-INCLUDES = \
-	-I$(top_srcdir)/include
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-include Python.h
 
 bin_PROGRAMS = enigma2
 
@@ -39,38 +41,11 @@ version.h: entries
 		fi; \
 	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
-
 enigma2_LDADD = \
-	@FREETYPE_LIBS@ \
-	@ID3TAG_LIBS@ \
-	@MAD_LIBS@ \
-	@PNG_LIBS@ \
-	@SDL_LIBS@ \
-	@SIGC_LIBS@ \
-	@DVBSI_LIBS@ \
-	@FRIBIDI_LIBS@ \
-	@GSTREAMER_LIBS@ \
-	@GSTREAMERPBUTILS_LIBS@ \
-	@JPEG_LIBS@ \
+	$(top_builddir)/lib/libenigma.la \
+	@BASE_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)
+	@LIBXINE_LIBS@ \
+	@PTHREAD_LIBS@ \
+	@SDL_LIBS@ \
+	@LIBS@