diff --git a/jtag/Makefile.am b/jtag/Makefile.am index 29b4bd09..bdc9bb9d 100644 --- a/jtag/Makefile.am +++ b/jtag/Makefile.am @@ -24,7 +24,6 @@ include $(top_srcdir)/Makefile.rules SUBDIRS = \ - inclow \ libbrux \ doc \ include \ @@ -32,6 +31,10 @@ SUBDIRS = \ src \ po +DIST_SUBDIRS = \ + inclow \ + $(SUBDIRS) + noinst_HEADERS = \ sysdep.h diff --git a/jtag/configure.ac b/jtag/configure.ac index 5020eba1..3a9b3ee1 100644 --- a/jtag/configure.ac +++ b/jtag/configure.ac @@ -104,8 +104,24 @@ fi AC_CONFIG_SUBDIRS(libbrux) -AC_CONFIG_SUBDIRS(inclow) +#AC_ARG_WITH(include, +# AC_HELP_STRING([--with-include=PATH], [Absolute path to the openwince includes]), +# openwince_inc="$withval") +#AC_CACHE_CHECK([for the openwince includes], openwince_includes_path, [ +# openwince_includes_path="no" +# for openwince_include in $openwince_inc /usr/include/openwince /usr/local/include/openwince; do +# if test -f "$openwince_include/common.h"; then +# openwince_includes_path="$openwince_include" +# break +# fi +# done +#]) +#if test "$openwince_includes_path" = "no"; then +# AC_MSG_ERROR([The openwince include package can not be found.]) +#fi +#CPPFLAGS="$CPPFLAGS -I$openwince_includes_path -I$openwince_includes_path/device -I$openwince_includes_path/arm" +AC_CONFIG_SUBDIRS(inclow) CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/inclow" CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/inclow/device" CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/inclow/arm" diff --git a/jtag/libbrux/configure.ac b/jtag/libbrux/configure.ac index 620aef98..e8581dda 100644 --- a/jtag/libbrux/configure.ac +++ b/jtag/libbrux/configure.ac @@ -46,23 +46,26 @@ AM_GNU_GETTEXT_VERSION(0.14.1) AC_PROG_CC AC_PROG_RANLIB -AC_ARG_WITH(include, - AC_HELP_STRING([--with-include=PATH], [Path to the openwince includes]), - openwince_inc="$withval") - -AC_CACHE_CHECK([for the openwince includes], openwince_includes_path, [ - openwince_includes_path="no" - for openwince_include in $openwince_inc /usr/include/openwince /usr/local/include/openwince; do - if test -f "$openwince_include/common.h"; then - openwince_includes_path="$openwince_include" - break - fi - done -]) -if test "$openwince_includes_path" = "no"; then - AC_MSG_ERROR([The openwince include package not found.]) -fi -CPPFLAGS="$CPPFLAGS -I$openwince_includes_path -I$openwince_includes_path/device -I$openwince_includes_path/arm" +#AC_ARG_WITH(include, +# AC_HELP_STRING([--with-include=PATH], [Path to the openwince includes]), +# openwince_inc="$withval") +# +#AC_CACHE_CHECK([for the openwince includes], openwince_includes_path, [ +# openwince_includes_path="no" +# for openwince_include in $openwince_inc /usr/include/openwince /usr/local/include/openwince; do +# if test -f "$openwince_include/common.h"; then +# openwince_includes_path="$openwince_include" +# break +# fi +# done +#]) +#if test "$openwince_includes_path" = "no"; then +# AC_MSG_ERROR([The openwince include package not found.]) +#fi +#CPPFLAGS="$CPPFLAGS -I$openwince_includes_path -I$openwince_includes_path/device -I$openwince_includes_path/arm" +CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/../inclow" +CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/../inclow/device" +CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/../inclow/arm" CFLAGS="$CFLAGS -Wall" CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/../include"