Author: mlytwyn
Date: Wed May 11 23:33:19 2016
New Revision: 39741
URL: http://svn.gna.org/viewcvs/gnustep?rev=39741&view=rev
Log:
Fix MSUserNotifications GNUmakefile processing to adhere to conventions
Added:
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile.postamble
Modified:
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile.gnustep
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile.windows
Modified:
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile?rev=39741&r1=39740&r2=39741&view=diff
==============================================================================
---
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile
(original)
+++
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile
Wed May 11 23:33:19 2016
@@ -1,20 +1,3 @@
-
-all: ToastNotifications-0.dll
-
-clean:
- rm -rf obj
- (cd ToastNotifications/Debug && (find . -type f | grep -v '.dll' |
xargs rm -rf))
- (cd ToastNotifications/Release && (find . -type f | grep -v '.dll' |
xargs rm -rf))
- (rm -rf ToastNotifications/ToastNotifications/Debug)
- (rm -rf ToastNotifications/ToastNotifications/Release)
- (rm -rf ToastNotifications/ipch ToastNotifications/*.sdf)
-
-distclean: clean
-
-obj:
- mkdir -p obj
-
-install: ToastNotifications-0.dll
ifeq ($(debug),yes)
ToastNotifications-0.dll: obj ToastNotifications/Debug/ToastNotifications.dll
@@ -25,3 +8,5 @@
endif
include $(GNUSTEP_MAKEFILES)/common.make
+include $(GNUSTEP_MAKEFILES)/aggregate.make
+-include GNUmakefile.postamble
Modified:
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile.gnustep
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile.gnustep?rev=39741&r1=39740&r2=39741&view=diff
==============================================================================
---
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile.gnustep
(original)
+++
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile.gnustep
Wed May 11 23:33:19 2016
@@ -1,31 +1,12 @@
-ifeq ($(GNUSTEP_MAKEFILES),)
- GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES
2>/dev/null)
- ifeq ($(GNUSTEP_MAKEFILES),)
- $(warning )
- $(warning Unable to obtain GNUSTEP_MAKEFILES setting from gnustep-config!)
- $(warning Perhaps gnustep-make is not properly installed,)
- $(warning so gnustep-config is not in your PATH.)
- $(warning )
- $(warning Your PATH is currently $(PATH))
- $(warning )
- endif
+
+ifeq ($(debug),yes)
+ToastNotifications-0.dll: obj ToastNotifications/Debug/ToastNotifications.dll
+ cp -p ToastNotifications/Debug/ToastNotifications.dll
obj/ToastNotifications-0.dll
+else
+ToastNotifications-0.dll: obj ToastNotifications/Release/ToastNotifications.dll
+ cp -p ToastNotifications/Release/ToastNotifications.dll
obj/ToastNotifications-0.dll
endif
-ifeq ($(GNUSTEP_MAKEFILES),)
- $(error You need to set GNUSTEP_MAKEFILES before compiling!)
-endif
-
-LIBRARY_NAME = ToastNotifications
-
-ToastNotifications_NEEDS_GUI = NO
-ToastNotification_CFLAGS += -DBUILD_DLL
-ToastNotification_OBJCFLAGS += -DBUILD_DLL
-ToastNotifications_LDFLAGS +=
-ToastNotifications_OBJC_FILES =
-ToastNotifications_OBJCC_FILES = ToastNotifications.mm
-ToastNotifications_RESOURCE_FILES +=
-
-ADDITIONAL_OBJCCFLAGS += -DBUILD_DLL
-
include $(GNUSTEP_MAKEFILES)/common.make
-include $(GNUSTEP_MAKEFILES)/library.make
+include $(GNUSTEP_MAKEFILES)/aggregate.make
+-include GNUmakefile.postamble
Added:
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile.postamble
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile.postamble?rev=39741&view=auto
==============================================================================
---
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile.postamble
(added)
+++
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile.postamble
Wed May 11 23:33:19 2016
@@ -0,0 +1,15 @@
+# Things to do before compiling
+before-all:: ToastNotifications-0.dll
+ mkdir -p obj
+
+# Things to do after compiling
+# after-all::
+
+# Things to do after clean
+after-clean::
+ rm -rf obj
+ (cd ToastNotifications/Debug && (find . -type f | grep -v '.dll' |
xargs rm -rf))
+ (cd ToastNotifications/Release && (find . -type f | grep -v '.dll' |
xargs rm -rf))
+ (rm -rf ToastNotifications/ToastNotifications/Debug)
+ (rm -rf ToastNotifications/ToastNotifications/Release)
+ (rm -rf ToastNotifications/ipch ToastNotifications/*.sdf)
Modified:
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile.windows
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile.windows?rev=39741&r1=39740&r2=39741&view=diff
==============================================================================
---
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile.windows
(original)
+++
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/ToastNotifications/GNUmakefile.windows
Wed May 11 23:33:19 2016
@@ -1,18 +1,31 @@
+ifeq ($(GNUSTEP_MAKEFILES),)
+ GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES
2>/dev/null)
+ ifeq ($(GNUSTEP_MAKEFILES),)
+ $(warning )
+ $(warning Unable to obtain GNUSTEP_MAKEFILES setting from gnustep-config!)
+ $(warning Perhaps gnustep-make is not properly installed,)
+ $(warning so gnustep-config is not in your PATH.)
+ $(warning )
+ $(warning Your PATH is currently $(PATH))
+ $(warning )
+ endif
+endif
-all: ToastNotifications-0.dll
+ifeq ($(GNUSTEP_MAKEFILES),)
+ $(error You need to set GNUSTEP_MAKEFILES before compiling!)
+endif
-clean:
- rm -rf obj
+LIBRARY_NAME = ToastNotifications
-obj:
- mkdir -p obj
+ToastNotifications_NEEDS_GUI = NO
+ToastNotification_CFLAGS += -DBUILD_DLL
+ToastNotification_OBJCFLAGS += -DBUILD_DLL
+ToastNotifications_LDFLAGS +=
+ToastNotifications_OBJC_FILES =
+ToastNotifications_OBJCC_FILES = ToastNotifications.mm
+ToastNotifications_RESOURCE_FILES +=
-install: ToastNotifications-0.dll
+ADDITIONAL_OBJCCFLAGS += -DBUILD_DLL
-ifeq ($(debug),yes)
-ToastNotifications-0.dll: obj ToastNotifications/Debug/ToastNotifications.dll
- cp -p ToastNotifications/Debug/ToastNotifications.dll
obj/ToastNotifications-0.dll
-else
-ToastNotifications-0.dll: obj ToastNotifications/Release/ToastNotifications.dll
- cp -p ToastNotifications/Release/ToastNotifications.dll
obj/ToastNotifications-0.dll
-endif
+include $(GNUSTEP_MAKEFILES)/common.make
+include $(GNUSTEP_MAKEFILES)/library.make
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
