Makefiles fix

diff --git a/kprobe/Makefile b/kprobe/Makefile
deleted file mode 100644 (file)
index d3ed8fe..0000000
--- a/kprobe/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-target_kernel_src = @KERNEL@
-#board = @BOARD@
-target_arch = @ARCH@
-kprobes_module_dir = $(realpath $(top_srcdir)/src/modules/kprobe)
-module_name = swap_kprobe
-cross_compiler = $(subst gcc,,$(CC))
-
-
-all-local:
-       rm -f $(top_srcdir)/src/modules/kprobe/arch/asm && $(LN_S) asm-${target_arch} $(top_srcdir)/src/modules/kprobe/arch/asm
-       $(MAKE) CROSS_COMPILE=$(cross_compiler) ARCH=$(target_arch) android_opt=$(android_opt) board_opt=$(board_opt) $(AM_MAKEFLAGS) -C $(target_kernel_src) M=$(kprobes_module_dir) modules
-
-clean-local:
-       $(MAKE) CROSS_COMPILE=$(cross_compiler) ARCH=$(target_arch) $(AM_MAKEFLAGS) -C $(target_kernel_src) M=$(kprobes_module_dir) clean
-
-install-exec-local:
-       install -m 644 $(kprobes_module_dir)/$(module_name).ko $(prefix)
-       if [ "$(android)" != "yes" ] ; then install -m 755 $(kprobes_module_dir)/$(module_name).sh $(prefix) ; fi
-

diff --git a/kprobe/Makefile.am b/kprobe/Makefile.am
index 27c19fe..951237f 100644 (file)
--- a/kprobe/Makefile.am
+++ b/kprobe/Makefile.am
@@ -5,4 +5,23 @@ endif
 
 board_opt = -DBOARD_@BOARD@
 
-include Makefile
+target_kernel_src = @KERNEL@
+#board = @BOARD@
+target_arch = @ARCH@
+kprobes_module_dir = $(realpath $(top_srcdir)/src/modules/kprobe)
+module_name = swap_kprobe
+cross_compiler = $(subst gcc,,$(CC))
+
+
+all-local:
+       rm -f $(top_srcdir)/src/modules/kprobe/arch/asm && $(LN_S) asm-${target_arch} $(top_srcdir)/src/modules/kprobe/arch/asm
+       $(MAKE) CROSS_COMPILE=$(cross_compiler) ARCH=$(target_arch) android_opt=$(android_opt) board_opt=$(board_opt) $(AM_MAKEFLAGS) -C $(target_kernel_src) M=$(kprobes_module_dir) modules
+
+clean-local:
+       $(MAKE) CROSS_COMPILE=$(cross_compiler) ARCH=$(target_arch) $(AM_MAKEFLAGS) -C $(target_kernel_src) M=$(kprobes_module_dir) clean
+
+install-exec-local:
+       install -m 644 $(kprobes_module_dir)/$(module_name).ko $(prefix)
+       if [ "$(android)" != "yes" ] ; then install -m 755 $(kprobes_module_dir)/$(module_name).sh $(prefix) ; fi
+
+