diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-10-22 16:10:02 +0000 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-11-16 17:09:12 +0100 |
| commit | 97b86324d322309843cc5d9d93b039d706c5ae58 (patch) | |
| tree | 8dbe7f23a3ef31bbaa8a3ac131961aee215555b4 /main/Makefile.am | |
| parent | 35f2eed2476bcaf47f06894fb2375137bd950941 (diff) | |
| download | enigma2-97b86324d322309843cc5d9d93b039d706c5ae58.tar.gz enigma2-97b86324d322309843cc5d9d93b039d706c5ae58.zip | |
clean up build
* reduce use of TUXBOX macros
* fix compiler warnings by including Python.h from the command-line
* use libtool to build and link main/* and lib/*
* don't link libmad, libid3tag, libcrypt, libresolv, librt, ldl into e2
* fix make rules of actionids.h
Diffstat (limited to 'main/Makefile.am')
| -rw-r--r-- | main/Makefile.am | 43 |
1 files changed, 9 insertions, 34 deletions
diff --git a/main/Makefile.am b/main/Makefile.am index fa889c0a..4eebe996 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -1,5 +1,7 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/include + -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@ |