Fixes #11758: Separate scala plugin akefiles from generic plugin make…

…files

datasources/Makefile

@@ -1,13 +1,12 @@
 #
-# make all will build node-external-reports.rpkg. 
-# make demo will build a license limited version of the plugin
+# make all : will build node-external-reports.rpkg. 
+# make licensed : will build a license limited version of the plugin
 #
 
-include ../common-scala-plugin.mk
+include ../makefiles/common-scala-plugin.mk
 
-plugin: all
+FILES += $(NAME)/datasources-schema.sql
 
-plugin-resources:
+target/$(NAME)/datasources-schema.sql:
 	cp ./src/main/resources/datasources-schema.sql target/$(NAME)/
 
-

helloworld/Makefile

@@ -3,14 +3,24 @@
 # make demo will build a license limited version of the plugin
 #
 
+# Use this one for a Scala plugin
 include ../common-scala-plugin.mk
 
-plugin: all
+# Uncomment this one for a non scala plugin
+#include ../common-plugin.mk
 
-# this plugin has no resources to install
-plugin-resources:
-	# nothing to cp into target$(NAME)
-	# example could be: 
+# Uncomment to add files to include in the plugin's main directory
+# Those files are relative to the target/ directory
+#FILES += $(NAME)/helloworld.properties
+#target/$(NAME)/helloworld.properties:
 	#cp src/main/resources/helloworld.properties target/$(NAME)/
 
+# Uncomment to add scripts to the plugin (default is to have only postinst)
+# Those files are relative to the packaging directory
+#SCRIPTS += preinst
+
+# Add another archive to the plugin (files.txz is the first one)
+#OTHER_ARCHIVES += target/other.txz
+#target/other.txz:
+	#tar cJ -C packaging -f target/other.txz file1 file2
 

node-external-reports/Makefile

@@ -10,9 +10,8 @@ include ../common-scala-plugin.mk
 
 CONFIG_FILE_PATH = src/main/resources/node-external-reports.properties
 
-plugin: all
+FILES += $(NAME)/$(CONFIG_FILE_PATH)
 
-plugin-resources:
+target/$(NAME)/$(CONFIG_FILE_PATH)
 	cp $(CONFIG_FILE_PATH) target/$(NAME)/
 
-