Merge remote-tracking branch 'navit/trunk' into pr-5-hide-keyspr-5-hide-keys

4 files changed, 0 insertions, 54 deletions

diff --git a/navit/binding/Makefile.am b/navit/binding/Makefile.am
deleted file mode 100644
index 6b782b48a..000000000
--- a/navit/binding/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-SUBDIRS=
-if BINDING_PYTHON
-  SUBDIRS+=python
-endif
-if BINDING_DBUS
-  SUBDIRS+=dbus
-endif
-
-if BINDING_WIN32
-  SUBDIRS+=win32
-endif
-
-
-DIST_SUBDIRS=python dbus win32
-
diff --git a/navit/binding/dbus/Makefile.am b/navit/binding/dbus/Makefile.am
deleted file mode 100644
index 1e6334291..000000000
--- a/navit/binding/dbus/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @DBUS_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=binding_dbus
-modulebinding_LTLIBRARIES = libbinding_dbus.la
-libbinding_dbus_la_SOURCES = binding_dbus.c
-libbinding_dbus_la_LIBADD = @DBUS_LIBS@
-libbinding_dbus_la_LDFLAGS = -module -avoid-version
-
-servicedir = @DBUS_SERVICE_DIR@
-service_in_files = org.navit_project.navit.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-$(service_DATA): $(service_in_files) Makefile
-	sed -e "s|\@bindir\@|$(bindir)|" $< > $@
-
-EXTRA_DIST = $(service_in_files)
-
-distclean-local:
-	rm -f $(service_DATA)
diff --git a/navit/binding/python/Makefile.am b/navit/binding/python/Makefile.am
deleted file mode 100644
index a71632317..000000000
--- a/navit/binding/python/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @PYTHON_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=binding_python
-modulebinding_LTLIBRARIES = libbinding_python.la
-libbinding_python_la_SOURCES = binding_python.c config.c navit.c pcoord.c route.c navigation.c attr.c common.h
-libbinding_python_la_LIBADD = @PYTHON_LIBS@
-libbinding_python_la_LDFLAGS = -module -avoid-version
diff --git a/navit/binding/win32/Makefile.am b/navit/binding/win32/Makefile.am
deleted file mode 100644
index f25c28d3e..000000000
--- a/navit/binding/win32/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = -I$(top_srcdir)/navit -I$(top_srcdir)/navit/binding/win32 @NAVIT_CFLAGS@ -DMODULE=binding_win32
-if PLUGINS
-modulebinding_LTLIBRARIES = libbinding_win32.la
-else
-noinst_LTLIBRARIES = libbinding_win32.la
-endif
-libbinding_win32_la_SOURCES = binding_win32.c binding_win32.h
-libbinding_win32_la_LIBADD = 
-libbinding_win32_la_LDFLAGS = -module -avoid-version
-bin_PROGRAMS=tell_navit
-tell_navit_LDADD = @NAVIT_LIBS@
-if SUPPORT_WIN32CE
-   tell_navit_LDADD += -L$(top_builddir)/navit/support/libc -lsupport_libc
-endif