Mercurial > hg > thermostat-ng > agent

changeset 2465:6eb9411e5d89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set a default JNI_PLATFORM (=linux) in Makefiles, and fixes a build failure This patch adds default JNI_PLATFORM (=linux) to the makefiles that need it, restoring previous behaviour. It doesn't address the keychain makefiles since those are generated. Also, fixed 'clean' target to continue if nothing to clean ("rm" -> "rm -f") As well, this patch reverts the behaviour of thermostat-common shell script, to ignore JDK_HOME, thus fixing a build failure. Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-September/021073.html
author Simon Tooke <stooke@redhat.com>
date Fri, 23 Sep 2016 17:13:44 +0200
parents bd5564a3de33
children 6302ed7dc808
files agent/core/Makefile distribution/scripts/thermostat-common laf-utils/Makefile
diffstat 3 files changed, 9 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/agent/core/Makefile	Fri Sep 23 10:04:43 2016 -0400
+++ b/agent/core/Makefile	Fri Sep 23 17:13:44 2016 +0200
@@ -4,6 +4,7 @@
 MYLDFLAGS  = -fPIC -shared $(EXTRA_CFLAGS)
 COPY       = cp -a
 
+JNI_PLATFORM = linux
 CLASSPATH  = target/classes/
 TARGET_DIR = target
 SO_PREFIX  = lib
@@ -46,12 +47,12 @@
 	$(CC) $(MYCFLAGS) $(CFLAGS) $(INCLUDE) $< -o $@
 
 clean-lib:
-	rm $(TARGET_DIR)/$(HOSTNAME_EXECUTABLE)
-	rm $(TARGET_DIR)/$(USERNAME_EXECUTABLE)
+	rm -f $(TARGET_DIR)/$(HOSTNAME_EXECUTABLE)
+	rm -f $(TARGET_DIR)/$(USERNAME_EXECUTABLE)
 	
 clean-obj:
-	rm $(HOSTNAME_OBJECTS) $(HOSTNAME_TARGET)
-	rm $(USERNAME_OBJECTS) $(USERNAME_TARGET)
+	rm -f $(HOSTNAME_OBJECTS) $(HOSTNAME_TARGET)
+	rm -f $(USERNAME_OBJECTS) $(USERNAME_TARGET)
 	
 clean: clean-obj clean-lib
 	
--- a/distribution/scripts/thermostat-common	Fri Sep 23 10:04:43 2016 -0400
+++ b/distribution/scripts/thermostat-common	Fri Sep 23 17:13:44 2016 +0200
@@ -87,11 +87,7 @@
 THERMOSTAT_MAIN="com.redhat.thermostat.main.Thermostat"
 
 if [[ "${JAVA_HOME}" = "" ]]; then
-  if [[ "${JDK_HOME}" != "" ]]; then
-    jdk_home_candidate="${JDK_HOME}"
-  else
-    jdk_home_candidate="@thermostat.jdk.home@"
-  fi
+  jdk_home_candidate="@thermostat.jdk.home@"
   if [[ -e "${jdk_home_candidate}/bin/javac" ]]; then
     JAVA_HOME="${jdk_home_candidate}"
   else
--- a/laf-utils/Makefile	Fri Sep 23 10:04:43 2016 -0400
+++ b/laf-utils/Makefile	Fri Sep 23 17:13:44 2016 +0200
@@ -4,6 +4,7 @@
 MYLDFLAGS  = -fPIC -shared $(EXTRA_CFLAGS)
 COPY       = cp -a
 
+JNI_PLATFORM = linux
 CLASSPATH  = target/classes/
 TARGET_DIR = target
 SO_PREFIX  = lib
@@ -41,10 +42,10 @@
 	$(CC) $(MYCFLAGS) $(CFLAGS) $(INCLUDE) $< -o $@
 
 clean-lib:
-	rm $(TARGET_DIR)/$(EXECUTABLE)
+	rm -f $(TARGET_DIR)/$(EXECUTABLE)
 	
 clean-obj:
-	rm $(OBJECTS) $(TARGET)
+	rm -f $(OBJECTS) $(TARGET)
 	
 clean: clean-obj clean-lib