regenerated configure and makefiles

danomatika · Feb 18, 2014 · d5736e9 · d5736e9
1 parent 560c77f
commit d5736e9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/configure b/configure
@@ -5211,15 +5211,13 @@ esac
 
 
 # add linker flags for GCC (needed by Linaro/udoo)
-if test "x$GCC" = xyes; then
-    case "$host_os" in
-    	darwin*|mingw*)
-        	;;
-    	*)
-        	LDFLAGS+="-Wl,--no-as-needed"
-        	;;
-    esac
-fi
+case "$host_os" in
+	*linux*)
+       		LDFLAGS="$LDFLAGS -Wl,--no-as-needed"
+       		;;
+	*)
+		;;
+esac
 
 #########################################
 ##### Externals #####
@@ -6860,14 +6858,14 @@ fi
 
 	Source directory:     $srcdir
 	Installation prefix:  $prefix
-	C++ compiler:         $CXX $CXXFLAGS
+	C++ compiler:         $CXX $CXXFLAGS $LDFLAGS
 	Debug build:          $enable_debug
 " >&5
 $as_echo "
 	rc-unitd $VERSION is now configured
 
 	Source directory:     $srcdir
 	Installation prefix:  $prefix
-	C++ compiler:         $CXX $CXXFLAGS
+	C++ compiler:         $CXX $CXXFLAGS $LDFLAGS
 	Debug build:          $enable_debug
 " >&6; }
diff --git a/data/Makefile.in b/data/Makefile.in
@@ -260,8 +260,6 @@ thisdir = $(srcdir)
 dist_configfiles_DATA = example_config.xml 85-rc-unitd.rules.source
 configfilesdir = $(docdir)
 
-#touch $(thisdir)/85-rc-unitd.rules
-
 # include pd files
 dist_pd_readme_DATA = $(thisdir)/pd/README
 pd_readmedir = $(docdir)/pd

diff --git a/src/lsjs/Makefile.in b/src/lsjs/Makefile.in
@@ -288,7 +288,7 @@ lsjs_SOURCES = main.cpp
 AM_CPPFLAGS = $(CXXFLAGS) $(SDL_CFLAGS) $(LO_CFLAGS) $(EXTERNALS_CFLAGS)
 
 # libs to link
-AM_LDFLAGS = $(SDL_LIBS) $(LO_LIBS)
+AM_LDFLAGS = $(LDFLAGS) $(SDL_LIBS) $(LO_LIBS)
 all: all-am
 
 .SUFFIXES:

diff --git a/src/rc-unit-notifier/Makefile.in b/src/rc-unit-notifier/Makefile.in
@@ -294,7 +294,7 @@ rc_unit_notifier_LDADD = -L$(top_builddir)/src/lib -lunit \
 AM_CPPFLAGS = $(CXXFLAGS) $(SDL_CFLAGS) $(LO_CFLAGS) $(EXTERNALS_CFLAGS) 
 
 # libs to link
-AM_LDFLAGS = $(SDL_LIBS) $(LO_LIBS)
+AM_LDFLAGS = $(LDFLAGS) $(SDL_LIBS) $(LO_LIBS)
 all: all-am
 
 .SUFFIXES:

diff --git a/src/rc-unitd/Makefile.in b/src/rc-unitd/Makefile.in
@@ -308,7 +308,7 @@ AM_CPPFLAGS = $(CXXFLAGS) $(SDL_CFLAGS) $(LO_CFLAGS) $(EXTERNALS_CFLAGS) \
 
 
 # libs to link
-AM_LDFLAGS = $(SDL_LIBS) $(LO_LIBS)
+AM_LDFLAGS = $(LDFLAGS) $(SDL_LIBS) $(LO_LIBS)
 all: all-am
 
 .SUFFIXES: