From e6a10ee0729529c94f5d030b17dc172a5f708e9e Mon Sep 17 00:00:00 2001 From: mazze Date: Sat, 14 Dec 2013 09:10:08 +0000 Subject: [PATCH] Added missing file. Metatarget cleanup. git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@48571 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- scalos/Modules/Delete.MUI/Source/mmakefile.src | 2 +- scalos/Modules/Empty_Trashcan.MUI/mmakefile.src | 2 +- scalos/Modules/Exchange.MUI/mmakefile.src | 2 +- scalos/Modules/Execute_Command.MUI/mmakefile.src | 2 +- scalos/Modules/Find.MUI/mmakefile.src | 2 +- scalos/Modules/FormatDisk.Gadtools/mmakefile.src | 2 +- scalos/Modules/IconProperties.MUI/mmakefile.src | 2 +- scalos/Modules/Information.MUI/mmakefile.src | 2 +- scalos/Modules/NewDrawer.MUI/mmakefile.src | 2 +- scalos/Modules/Rename.MUI/mmakefile.src | 2 +- scalos/Modules/Updater.MUI/mmakefile.src | 2 +- scalos/Modules/WindowProperties.MUI/mmakefile.src | 2 +- scalos/Prefs/MainPrefs/mmakefile.src | 3 +++ scalos/common/Plugin/mmakefile.src | 12 ++++++++++++ scalos/common/Plugin/scalosprefsplugin-aros.conf | 11 +++++++++++ scalos/main/envarc/mmakefile.src | 8 +++++--- 16 files changed, 43 insertions(+), 15 deletions(-) create mode 100644 scalos/common/Plugin/scalosprefsplugin-aros.conf diff --git a/scalos/Modules/Delete.MUI/Source/mmakefile.src b/scalos/Modules/Delete.MUI/Source/mmakefile.src index e411d7eed..4bdf40636 100755 --- a/scalos/Modules/Delete.MUI/Source/mmakefile.src +++ b/scalos/Modules/Delete.MUI/Source/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg -#MM- contrib-scalos-main : contrib-scalos-modules-delete +#MM- contrib-scalos : contrib-scalos-modules-delete #MM contrib-scalos-modules-delete : \ #MM includes \ diff --git a/scalos/Modules/Empty_Trashcan.MUI/mmakefile.src b/scalos/Modules/Empty_Trashcan.MUI/mmakefile.src index 6796fc27d..e27522c33 100755 --- a/scalos/Modules/Empty_Trashcan.MUI/mmakefile.src +++ b/scalos/Modules/Empty_Trashcan.MUI/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg -#MM- contrib-scalos-main : contrib-scalos-modules-emptytrashcan +#MM- contrib-scalos : contrib-scalos-modules-emptytrashcan #MM contrib-scalos-modules-emptytrashcan : \ #MM includes \ diff --git a/scalos/Modules/Exchange.MUI/mmakefile.src b/scalos/Modules/Exchange.MUI/mmakefile.src index 95fc6c097..e10c0f4ae 100755 --- a/scalos/Modules/Exchange.MUI/mmakefile.src +++ b/scalos/Modules/Exchange.MUI/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg -#MM- contrib-scalos-main : contrib-scalos-modules-exchange +#MM- contrib-scalos : contrib-scalos-modules-exchange #MM contrib-scalos-modules-exchange : \ #MM includes \ diff --git a/scalos/Modules/Execute_Command.MUI/mmakefile.src b/scalos/Modules/Execute_Command.MUI/mmakefile.src index b0ef0d7be..6caa7b63f 100755 --- a/scalos/Modules/Execute_Command.MUI/mmakefile.src +++ b/scalos/Modules/Execute_Command.MUI/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg -#MM- contrib-scalos-main : contrib-scalos-modules-executecommand +#MM- contrib-scalos : contrib-scalos-modules-executecommand #MM contrib-scalos-modules-executecommand : \ #MM includes \ diff --git a/scalos/Modules/Find.MUI/mmakefile.src b/scalos/Modules/Find.MUI/mmakefile.src index bb0a58f52..c6de5c039 100755 --- a/scalos/Modules/Find.MUI/mmakefile.src +++ b/scalos/Modules/Find.MUI/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg -#MM- contrib-scalos-main : contrib-scalos-modules-find +#MM- contrib-scalos : contrib-scalos-modules-find #MM contrib-scalos-modules-find : \ #MM includes \ diff --git a/scalos/Modules/FormatDisk.Gadtools/mmakefile.src b/scalos/Modules/FormatDisk.Gadtools/mmakefile.src index 567a1a1d9..78c4e3dbc 100755 --- a/scalos/Modules/FormatDisk.Gadtools/mmakefile.src +++ b/scalos/Modules/FormatDisk.Gadtools/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg -#MM- contrib-scalos-main : contrib-scalos-modules-formatdisk +#MM- contrib-scalos : contrib-scalos-modules-formatdisk #MM contrib-scalos-modules-formatdisk : \ #MM includes \ diff --git a/scalos/Modules/IconProperties.MUI/mmakefile.src b/scalos/Modules/IconProperties.MUI/mmakefile.src index 9d2ec4d80..fcc087309 100755 --- a/scalos/Modules/IconProperties.MUI/mmakefile.src +++ b/scalos/Modules/IconProperties.MUI/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg -#MM- contrib-scalos-main : contrib-scalos-modules-iconproperties +#MM- contrib-scalos : contrib-scalos-modules-iconproperties #MM contrib-scalos-modules-iconproperties : \ #MM includes \ diff --git a/scalos/Modules/Information.MUI/mmakefile.src b/scalos/Modules/Information.MUI/mmakefile.src index d17ad425f..2b340d2e3 100755 --- a/scalos/Modules/Information.MUI/mmakefile.src +++ b/scalos/Modules/Information.MUI/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg -#MM- contrib-scalos-main : contrib-scalos-modules-information +#MM- contrib-scalos : contrib-scalos-modules-information #MM contrib-scalos-modules-information : \ #MM includes \ diff --git a/scalos/Modules/NewDrawer.MUI/mmakefile.src b/scalos/Modules/NewDrawer.MUI/mmakefile.src index 4b7c2fb06..4f9b85f17 100755 --- a/scalos/Modules/NewDrawer.MUI/mmakefile.src +++ b/scalos/Modules/NewDrawer.MUI/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg -#MM- contrib-scalos-main : contrib-scalos-modules-newdrawer +#MM- contrib-scalos : contrib-scalos-modules-newdrawer #MM contrib-scalos-modules-newdrawer : \ #MM includes \ diff --git a/scalos/Modules/Rename.MUI/mmakefile.src b/scalos/Modules/Rename.MUI/mmakefile.src index 67b75cccd..c22ae0ed3 100755 --- a/scalos/Modules/Rename.MUI/mmakefile.src +++ b/scalos/Modules/Rename.MUI/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg -#MM- contrib-scalos-main : contrib-scalos-modules-rename +#MM- contrib-scalos : contrib-scalos-modules-rename #MM contrib-scalos-modules-rename : \ #MM includes \ diff --git a/scalos/Modules/Updater.MUI/mmakefile.src b/scalos/Modules/Updater.MUI/mmakefile.src index 5af2304be..2cd7f2f0c 100755 --- a/scalos/Modules/Updater.MUI/mmakefile.src +++ b/scalos/Modules/Updater.MUI/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg -#MM- contrib-scalos-main : contrib-scalos-modules-updater +#MM- contrib-scalos : contrib-scalos-modules-updater #MM contrib-scalos-modules-updater : \ #MM includes \ diff --git a/scalos/Modules/WindowProperties.MUI/mmakefile.src b/scalos/Modules/WindowProperties.MUI/mmakefile.src index 66877c196..560184ab8 100755 --- a/scalos/Modules/WindowProperties.MUI/mmakefile.src +++ b/scalos/Modules/WindowProperties.MUI/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg -#MM- contrib-scalos-main : contrib-scalos-modules-windowproperties +#MM- contrib-scalos : contrib-scalos-modules-windowproperties #MM contrib-scalos-modules-windowproperties : \ #MM includes \ diff --git a/scalos/Prefs/MainPrefs/mmakefile.src b/scalos/Prefs/MainPrefs/mmakefile.src index 28ca524a1..3098c575b 100755 --- a/scalos/Prefs/MainPrefs/mmakefile.src +++ b/scalos/Prefs/MainPrefs/mmakefile.src @@ -10,6 +10,9 @@ include $(TOP)/config/make.cfg #MM contrib-scalos-prefs-main-locale \ #MM contrib-scalos-prefs-main-icon \ #MM contrib-scalos-library-includes \ +#MM contrib-scalos-libraries-preferences-includes \ +#MM contrib-scalos-libraries-scalosgfx-includes \ +#MM contrib-scalos-plugin-includes \ #MM contrib-scalos-prefsplugin-includes FILES := \ diff --git a/scalos/common/Plugin/mmakefile.src b/scalos/common/Plugin/mmakefile.src index 13b06736d..d9516f0e4 100644 --- a/scalos/common/Plugin/mmakefile.src +++ b/scalos/common/Plugin/mmakefile.src @@ -51,4 +51,16 @@ $(INCLUDES) : $(SRCDIR)/$(CURDIR)/scalosfiletypeplugin-aros.conf $(TARGETDIR)/inline $(TARGETDIR)/proto $(GENMODULE) -c $^ -d $(TARGETDIR) writeincludes scalosfiletypeplugin library + +INCLUDES := $(TARGETDIR)/clib/scalosprefsplugin_protos.h $(TARGETDIR)/defines/scalosprefsplugin.h \ + $(TARGETDIR)/inline/scalosprefsplugin.h $(TARGETDIR)/proto/scalosprefsplugin.h + +#MM +contrib-scalos-prefsplugin-includes : $(INCLUDES) + +$(INCLUDES) : $(SRCDIR)/$(CURDIR)/scalosprefsplugin-aros.conf + %mkdirs_q $(TARGETDIR)/clib $(TARGETDIR)/defines/ \ + $(TARGETDIR)/inline $(TARGETDIR)/proto + $(GENMODULE) -c $^ -d $(TARGETDIR) writeincludes scalosprefsplugin library + %common diff --git a/scalos/common/Plugin/scalosprefsplugin-aros.conf b/scalos/common/Plugin/scalosprefsplugin-aros.conf new file mode 100644 index 000000000..5a0e3a8c5 --- /dev/null +++ b/scalos/common/Plugin/scalosprefsplugin-aros.conf @@ -0,0 +1,11 @@ +##begin config +basename ScalosPrefsPlugin +libbase ScalosPrefsPluginBase +libbasetype struct Library +copyright Copyright ©1999-2002 The Scalos Team +version 40.0 +##end config + +##begin functionlist +ULONG SCAGetPrefsInfo(LONG which) (D0) +##end functionlist diff --git a/scalos/main/envarc/mmakefile.src b/scalos/main/envarc/mmakefile.src index 1343a0444..7ec2dabf3 100755 --- a/scalos/main/envarc/mmakefile.src +++ b/scalos/main/envarc/mmakefile.src @@ -10,9 +10,11 @@ include $(TOP)/config/make.cfg TARGETDIR := $(AROS_ENVARC) -FILES := deficons.prefs -%copy_files_q mmake=contrib-scalos-deficons \ - src=$(SRCDIR)/$(CURDIR) dst=$(TARGETDIR) +#MM +contrib-scalos-deficons : $(TARGETDIR)/deficons.prefs + +$(TARGETDIR)/deficons.prefs : $(SRCDIR)/$(CURDIR)/deficons.prefs + $(CP) $^ $@ TARGETDIR := $(AROS_ENVARC)/Scalos -- 2.11.4.GIT