Author: rfm
Date: Thu May 19 09:43:40 2016
New Revision: 39784
URL: http://svn.gna.org/viewcvs/gnustep?rev=39784&view=rev
Log:
remove obsolete conditionals
Modified:
apps/systempreferences/trunk/ChangeLog
apps/systempreferences/trunk/Modules/ColorSchemes/GNUmakefile.preamble
apps/systempreferences/trunk/Modules/Defaults/GNUmakefile.preamble
apps/systempreferences/trunk/Modules/FileSystem/GNUmakefile.preamble
apps/systempreferences/trunk/Modules/Fonts/GNUmakefile.preamble
apps/systempreferences/trunk/Modules/Internet/GNUmakefile.preamble
apps/systempreferences/trunk/Modules/ModifierKeys/GNUmakefile.preamble
apps/systempreferences/trunk/Modules/Themes/GNUmakefile.preamble
apps/systempreferences/trunk/Modules/TimeZone/GNUmakefile.preamble
apps/systempreferences/trunk/Modules/Volumes/GNUmakefile.preamble
apps/systempreferences/trunk/SystemPreferences/GNUmakefile.preamble
Modified: apps/systempreferences/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/ChangeLog?rev=39784&r1=39783&r2=39784&view=diff
==============================================================================
--- apps/systempreferences/trunk/ChangeLog (original)
+++ apps/systempreferences/trunk/ChangeLog Thu May 19 09:43:40 2016
@@ -1,3 +1,17 @@
+2016-05-19 Richard Frith-macdonald <r...@gnu.org>
+
+ * Modules/ColorSchemes/GNUmakefile.preamble:
+ * Modules/Defaults/GNUmakefile.preamble:
+ * Modules/FileSystem/GNUmakefile.preamble:
+ * Modules/Fonts/GNUmakefile.preamble:
+ * Modules/Internet/GNUmakefile.preamble:
+ * Modules/ModifierKeys/GNUmakefile.preamble:
+ * Modules/Themes/GNUmakefile.preamble:
+ * Modules/TimeZone/GNUmakefile.preamble:
+ * Modules/Volumes/GNUmakefile.preamble:
+ * SystemPreferences/GNUmakefile.preamble:
+ Remove obsolete conditionals
+
2016-02-17 Riccardo Mottola <r...@gnu.org>
* Modules/Volumes/Volumes.m
Modified: apps/systempreferences/trunk/Modules/ColorSchemes/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/Modules/ColorSchemes/GNUmakefile.preamble?rev=39784&r1=39783&r2=39784&view=diff
==============================================================================
--- apps/systempreferences/trunk/Modules/ColorSchemes/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/Modules/ColorSchemes/GNUmakefile.preamble
Thu May 19 09:43:40 2016
@@ -20,14 +20,7 @@
FRAMEWORK_NAME = PreferencePanes
endif
-# With gnustep-make v2, you can use the same -L flags on all systems
-# (the ones here used for mingw32). So once gnustep-make v2 is
-# widespread, go ahead and remove the distinction.
-ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
-else
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
-endif
+ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
#
# Flags dealing with installing and uninstalling
Modified: apps/systempreferences/trunk/Modules/Defaults/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/Modules/Defaults/GNUmakefile.preamble?rev=39784&r1=39783&r2=39784&view=diff
==============================================================================
--- apps/systempreferences/trunk/Modules/Defaults/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/Modules/Defaults/GNUmakefile.preamble Thu May
19 09:43:40 2016
@@ -20,14 +20,7 @@
FRAMEWORK_NAME = PreferencePanes
endif
-# With gnustep-make v2, you can use the same -L flags on all systems
-# (the ones here used for mingw32). So once gnustep-make v2 is
-# widespread, go ahead and remove the distinction.
-ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
-else
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
-endif
+ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
#
# Flags dealing with installing and uninstalling
Modified: apps/systempreferences/trunk/Modules/FileSystem/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/Modules/FileSystem/GNUmakefile.preamble?rev=39784&r1=39783&r2=39784&view=diff
==============================================================================
--- apps/systempreferences/trunk/Modules/FileSystem/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/Modules/FileSystem/GNUmakefile.preamble
Thu May 19 09:43:40 2016
@@ -20,14 +20,7 @@
FRAMEWORK_NAME = PreferencePanes
endif
-# With gnustep-make v2, you can use the same -L flags on all systems
-# (the ones here used for mingw32). So once gnustep-make v2 is
-# widespread, go ahead and remove the distinction.
-ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
-else
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
-endif
+ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
#
# Flags dealing with installing and uninstalling
Modified: apps/systempreferences/trunk/Modules/Fonts/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/Modules/Fonts/GNUmakefile.preamble?rev=39784&r1=39783&r2=39784&view=diff
==============================================================================
--- apps/systempreferences/trunk/Modules/Fonts/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/Modules/Fonts/GNUmakefile.preamble Thu May
19 09:43:40 2016
@@ -20,14 +20,7 @@
FRAMEWORK_NAME = PreferencePanes
endif
-# With gnustep-make v2, you can use the same -L flags on all systems
-# (the ones here used for mingw32). So once gnustep-make v2 is
-# widespread, go ahead and remove the distinction.
-ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
-else
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
-endif
+ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
#
# Flags dealing with installing and uninstalling
Modified: apps/systempreferences/trunk/Modules/Internet/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/Modules/Internet/GNUmakefile.preamble?rev=39784&r1=39783&r2=39784&view=diff
==============================================================================
--- apps/systempreferences/trunk/Modules/Internet/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/Modules/Internet/GNUmakefile.preamble Thu May
19 09:43:40 2016
@@ -20,14 +20,7 @@
FRAMEWORK_NAME = PreferencePanes
endif
-# With gnustep-make v2, you can use the same -L flags on all systems
-# (the ones here used for mingw32). So once gnustep-make v2 is
-# widespread, go ahead and remove the distinction.
-ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
-else
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
-endif
+ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
#
# Flags dealing with installing and uninstalling
Modified: apps/systempreferences/trunk/Modules/ModifierKeys/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/Modules/ModifierKeys/GNUmakefile.preamble?rev=39784&r1=39783&r2=39784&view=diff
==============================================================================
--- apps/systempreferences/trunk/Modules/ModifierKeys/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/Modules/ModifierKeys/GNUmakefile.preamble
Thu May 19 09:43:40 2016
@@ -20,14 +20,7 @@
FRAMEWORK_NAME = PreferencePanes
endif
-# With gnustep-make v2, you can use the same -L flags on all systems
-# (the ones here used for mingw32). So once gnustep-make v2 is
-# widespread, go ahead and remove the distinction.
-ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
-else
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
-endif
+ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
#
# Flags dealing with installing and uninstalling
Modified: apps/systempreferences/trunk/Modules/Themes/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/Modules/Themes/GNUmakefile.preamble?rev=39784&r1=39783&r2=39784&view=diff
==============================================================================
--- apps/systempreferences/trunk/Modules/Themes/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/Modules/Themes/GNUmakefile.preamble Thu May
19 09:43:40 2016
@@ -20,14 +20,7 @@
FRAMEWORK_NAME = PreferencePanes
endif
-# With gnustep-make v2, you can use the same -L flags on all systems
-# (the ones here used for mingw32). So once gnustep-make v2 is
-# widespread, go ahead and remove the distinction.
-ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
-else
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
-endif
+ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
#
# Flags dealing with installing and uninstalling
Modified: apps/systempreferences/trunk/Modules/TimeZone/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/Modules/TimeZone/GNUmakefile.preamble?rev=39784&r1=39783&r2=39784&view=diff
==============================================================================
--- apps/systempreferences/trunk/Modules/TimeZone/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/Modules/TimeZone/GNUmakefile.preamble Thu May
19 09:43:40 2016
@@ -20,14 +20,7 @@
FRAMEWORK_NAME = PreferencePanes
endif
-# With gnustep-make v2, you can use the same -L flags on all systems
-# (the ones here used for mingw32). So once gnustep-make v2 is
-# widespread, go ahead and remove the distinction.
-ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
-else
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
-endif
+ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
#
# Flags dealing with installing and uninstalling
Modified: apps/systempreferences/trunk/Modules/Volumes/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/Modules/Volumes/GNUmakefile.preamble?rev=39784&r1=39783&r2=39784&view=diff
==============================================================================
--- apps/systempreferences/trunk/Modules/Volumes/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/Modules/Volumes/GNUmakefile.preamble Thu May
19 09:43:40 2016
@@ -20,14 +20,7 @@
FRAMEWORK_NAME = PreferencePanes
endif
-# With gnustep-make v2, you can use the same -L flags on all systems
-# (the ones here used for mingw32). So once gnustep-make v2 is
-# widespread, go ahead and remove the distinction.
-ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
-else
- ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
-endif
+ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
#
# Flags dealing with installing and uninstalling
Modified: apps/systempreferences/trunk/SystemPreferences/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/SystemPreferences/GNUmakefile.preamble?rev=39784&r1=39783&r2=39784&view=diff
==============================================================================
--- apps/systempreferences/trunk/SystemPreferences/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/SystemPreferences/GNUmakefile.preamble Thu May
19 09:43:40 2016
@@ -25,14 +25,7 @@
# it doesn't work for you, you should install the PreferencesPanes
# framework before compiling this application.
-# With gnustep-make v2, you can use the same -L flags on all systems
-# (the ones here used for mingw32). So once gnustep-make v2 is
-# widespread, go ahead and remove the distinction.
-ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
- ADDITIONAL_LIB_DIRS +=
-L../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
-else
- ADDITIONAL_LIB_DIRS +=
-L../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
-endif
+ADDITIONAL_LIB_DIRS +=
-L../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
#
# Flags dealing with installing and uninstalling
_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs
