git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
follow eThread changes: mainly thread_running -> sync, hasStarted()
[enigma2.git]
/
main
/
Makefile.am
diff --git
a/main/Makefile.am
b/main/Makefile.am
index 2f63dff1297063882cc92579f86c12134eba1138..636c6ffa2c599b03ee8e9a7e98b62fae7909816d 100644
(file)
--- a/
main/Makefile.am
+++ b/
main/Makefile.am
@@
-4,28
+4,33
@@
INCLUDES = \
bin_PROGRAMS = enigma2
enigma2_SOURCES = \
bin_PROGRAMS = enigma2
enigma2_SOURCES = \
- enigma.cpp
+ enigma.cpp
bsod.cpp
enigma2_LDADD_WHOLE = \
enigma2_LDADD_WHOLE = \
+ $(top_builddir)/lib/actions/libenigma_actions.a \
$(top_builddir)/lib/base/libenigma_base.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/dvb/libenigma_dvb.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/gui/libenigma_gui.a \
+ $(top_builddir)/lib/dvb_ci/libenigma_dvb_ci.a \
$(top_builddir)/lib/gdi/libenigma_gdi.a \
$(top_builddir)/lib/gdi/libenigma_gdi.a \
- $(top_builddir)/lib/network/libenigma_network.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@ \
$(top_builddir)/lib/service/libenigma_service.a
enigma2_LDADD = \
@FREETYPE_LIBS@ \
@ID3TAG_LIBS@ \
@MAD_LIBS@ \
- @MD5SUM_LIBS@ \
@PNG_LIBS@ \
@SIGC_LIBS@ \
@PNG_LIBS@ \
@SIGC_LIBS@ \
- @XMLTREE_LIBS@ \
+ @DVBSI_LIBS@ \
+ @FRIBIDI_LIBS@ \
+ @GSTREAMER_LIBS@ \
-ldl -lpthread -lcrypt -lresolv
enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)
-ldl -lpthread -lcrypt -lresolv
enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)
-
@rm -f enigma2$(EXEEXT)
+
#
@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)
$(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)