Hildon is not Maemo-specific (Ubuntu Mobile...).
And Maemo soon won't be Hildon-GTK anymore.
12 files changed:
test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")])
dnl
test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")])
dnl
-AC_ARG_ENABLE(maemo,
- [ --enable-maemo Internet tablets based on Maemo SDK (default disabled)])
-if test "${enable_maemo}" = "yes"
-then
+AC_ARG_ENABLE(hildon,
+ [ --enable-hildon Hildon touchscreen UI (default disabled)])
+AS_IF([test "${enable_hildon}" = "yes"], [
PKG_CHECK_MODULES(HILDON, [hildon-1 hildon-fm-2], [
PKG_CHECK_MODULES(HILDON, [hildon-1 hildon-fm-2], [
- VLC_ADD_CFLAGS([maemo],[${HILDON_CFLAGS}])
- VLC_ADD_LIBS([maemo],[${HILDON_LIBS}])
- VLC_ADD_PLUGIN([maemo])
+ VLC_ADD_CFLAGS([hildon],[${HILDON_CFLAGS}])
+ VLC_ADD_LIBS([hildon],[${HILDON_LIBS}])
+ VLC_ADD_PLUGIN([hildon])
ALIASES="${ALIASES} mvlc"
], [
ALIASES="${ALIASES} mvlc"
], [
- AS_IF([test "${enable_maemo}" = "yes"],[
+ AS_IF([test "${enable_hildon}" = "yes"],[
AC_MSG_ERROR([Hildon libraries not found])
])
AC_MSG_ERROR([Hildon libraries not found])
])
-fi
-AM_CONDITIONAL(BUILD_MAEMO, [test "${enable_maemo}" = "yes"])
+])
+AM_CONDITIONAL(BUILD_HILDON, [test "${enable_hildon}" = "yes"])
modules/gui/Makefile
modules/gui/beos/Makefile
modules/gui/macosx/Makefile
modules/gui/Makefile
modules/gui/beos/Makefile
modules/gui/macosx/Makefile
- modules/gui/maemo/Makefile
+ modules/gui/hildon/Makefile
modules/gui/minimal_macosx/Makefile
modules/gui/qnx/Makefile
modules/gui/qt4/Makefile
modules/gui/minimal_macosx/Makefile
modules/gui/qnx/Makefile
modules/gui/qt4/Makefile
-DIST_SUBDIRS = beos macosx maemo minimal_macosx qnx qt4 skins2 wince
+DIST_SUBDIRS = beos macosx hildon minimal_macosx qnx qt4 skins2 wince
if HAVE_DARWIN
SUBDIRS += macosx minimal_macosx
endif
if HAVE_DARWIN
SUBDIRS += macosx minimal_macosx
endif
-if BUILD_MAEMO
-SUBDIRS += maemo
+if BUILD_HILDON
+SUBDIRS += hildon
endif
SUBDIRS += qnx
if ENABLE_QT4
endif
SUBDIRS += qnx
if ENABLE_QT4
-SOURCES_maemo = maemo.c \
+SOURCES_hildon = maemo.c \
maemo.h \
maemo_callbacks.c \
maemo_callbacks.h \
maemo.h \
maemo_callbacks.c \
maemo_callbacks.h \
# TODO: move to the mozilla directory
nobase_vlcdata_DATA += $(DIST_mozilla)
endif
# TODO: move to the mozilla directory
nobase_vlcdata_DATA += $(DIST_mozilla)
endif
nobase_vlcdata_DATA += $(DIST_maemo) $(maemo_FILES)
endif
nobase_vlcdata_DATA += $(DIST_maemo) $(maemo_FILES)
endif