Commit graph

52 commits

Author SHA1 Message Date
rfm
d0fae65d78 revert accidental update 2024-05-26 15:39:18 +01:00
rfm
ffe5f324e1 Changes for new release. 2024-05-26 11:32:19 +01:00
Frederik Seiffert
ce9d4f5526 Link subproject object files directly.
Instead of merging all subproject object files into subproject.o, we now create subproject.txt containing a list of all object files, and use these directly in SUBPROJECT_OBJ_FILES.
2021-02-03 12:29:02 +01:00
Niels Grewe
0223c11597 Add support for building jars from Java projects (`make jar').
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@38254 72102866-910b-0410-8b05-ffd578937521
2014-12-21 07:16:04 +00:00
Fred Kiefer
bcb8180e0d * Instance/rules.make: Add detection for different forms of the
Info.plist.
* Instance/application.make,
* Instance/bundle.make,
* Instance/framework.make,
* Instance/gswapp.make,
* Instance/palette.make,
* Instance/service.make: Use GNUSTEP_PLIST_DEPEND directly.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@37522 72102866-910b-0410-8b05-ffd578937521
2013-12-27 16:23:08 +00:00
Nicola Pero
988f5f3836 Fixes and improvements to 'make strings'; small cleanup of some other instance makefiles
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@31192 72102866-910b-0410-8b05-ffd578937521
2010-08-21 09:20:40 +00:00
Nicola Pero
7ad56c712e Fixed precompiled header code to not assume they have .h extension - now the .pch extension used by XCode should work too.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@30230 72102866-910b-0410-8b05-ffd578937521
2010-04-24 09:42:53 +00:00
Nicola Pero
44fb9c993e Store object files for gdomap in ./obj/gdomap.obj/ instead of simply ./obj/ to make it safe to parallel build multiple instances of everything
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@29571 72102866-910b-0410-8b05-ffd578937521
2010-02-12 09:19:25 +00:00
Nicola Pero
d14b6ae594 Added mode comment for emacs
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@29569 72102866-910b-0410-8b05-ffd578937521
2010-02-12 08:43:42 +00:00
Nicola Pero
be4bccb987 Extended FIXME on some parallel building stuff
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@29547 72102866-910b-0410-8b05-ffd578937521
2010-02-11 12:48:07 +00:00
Nicola Pero
4a6bd22750 Implemented parallel building of multiple tools, and documented it.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@29542 72102866-910b-0410-8b05-ffd578937521
2010-02-11 11:11:29 +00:00
Nicola Pero
0bfd3923ff Implemented having source files in subdirectories without using a subproject, as in xxx_OBJC_FILES = Source/Beauty.m
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@28791 72102866-910b-0410-8b05-ffd578937521
2009-10-10 17:33:02 +00:00
Riccardo Mottola
aa9a2dfcde Update and un-Win32-ify Cygwin rules.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@28595 72102866-910b-0410-8b05-ffd578937521
2009-09-01 23:19:02 +00:00
Nicola Pero
85a03b3339 Fixed linking programs that contain both C/ObjC and C++/ObjC++ files
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@28131 72102866-910b-0410-8b05-ffd578937521
2009-03-24 23:08:59 +00:00
Nicola Pero
67c70b37e0 Improved uninstallation - more accurate attempts to remove all directories that were created when installing. Moved creation of ADDITIONAL_INSTALL_DIRS in Master invocation so they can also be removed accurately. Added .NOTPARALLEL as a safety measure
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@27716 72102866-910b-0410-8b05-ffd578937521
2009-01-29 00:21:36 +00:00
Nicola Pero
e4da3e0371 Allow to have both file.c and file.m in the same project
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@26798 72102866-910b-0410-8b05-ffd578937521
2008-07-22 15:32:35 +00:00
Nicola Pero
19f9ee1fe8 Changed xxx_NEEDS_GUI and NEEDS_GUI to accept yes as well as YES as value; prefer yes as it's consistent with all other boolean options in gnustep-make
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@26263 72102866-910b-0410-8b05-ffd578937521
2008-03-11 01:06:50 +00:00
Nicola Pero
7f2a73decd Updated C++ and ObjC++ support
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@26186 72102866-910b-0410-8b05-ffd578937521
2008-03-03 23:24:48 +00:00
Nicola Pero
400bb44e99 Implemented NEEDS_GUI as a general variable to turn on/off linking against the gui library
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@26103 72102866-910b-0410-8b05-ffd578937521
2008-02-19 14:15:08 +00:00
Nicola Pero
bf5b212e0e Implemented xxx_NEEDS_GUI to control if we should be linking against gnustep-gui or not
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@26099 72102866-910b-0410-8b05-ffd578937521
2008-02-19 10:49:20 +00:00
Adam Fedor
6ef7c3e512 Update license to GPL 3
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@25539 72102866-910b-0410-8b05-ffd578937521
2007-10-30 14:18:41 +00:00
Nicola Pero
375f33aba3 Fixed copyright notices to tell the user they can read the GPL in the COPYING file, not COPYING.LIB
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@25329 72102866-910b-0410-8b05-ffd578937521
2007-07-13 10:11:48 +00:00
Nicola Pero
a181393476 Fixed precompiled headers when -I. is early in the command-line (eg, gnustep-gui)
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24395 72102866-910b-0410-8b05-ffd578937521
2007-01-22 01:33:39 +00:00
Nicola Pero
f13b3ebb61 Tidied GCC_WITH_PRECOMPILED_HEADERS variable. Explicit compare to yes/no to make it clearer and more robust, eg so that changes in the default value will not cause problems
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24372 72102866-910b-0410-8b05-ffd578937521
2007-01-16 17:40:33 +00:00
Nicola Pero
7d46a3d545 Make sure internal-precompile-headers target is marked as .PHONY
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24361 72102866-910b-0410-8b05-ffd578937521
2007-01-16 03:17:13 +00:00
Nicola Pero
effa404c14 Implemented precompiled headers support
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24360 72102866-910b-0410-8b05-ffd578937521
2007-01-16 02:04:51 +00:00
Adam Fedor
4d0e99ab89 * Fixes for cygwin.
* Instance/rules.make: Add Windows resource files for cygwin
* config.make.in: Cygwin does not have ln-s
* rules.make: Add Windows resource rules for cygwin
* target.make (cygwin): Fix shared link cmd.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21781 72102866-910b-0410-8b05-ffd578937521
2005-10-07 02:39:08 +00:00
Nicola Pero
fce27dc627 Support .mm files for ObjC++
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21778 72102866-910b-0410-8b05-ffd578937521
2005-10-06 02:10:50 +00:00
Adam Fedor
fc6da5128a * Changes to fix compilation on cygwin.
* target.make: Add generic BUNDLE_LINK_CMD.
(cygwin): Modify it for cygwin. New SHARED_LIB_LINK_CMD and
other support variables.
* Instance/application.make: Remove OLD_DLL_SUPPORT
* Instance/bundle.make: Idem. Use BUNDLE_LINK_CMD.
* Instance/library.make: Remove OLD_DLL_SUPPORT
* Instance/palette.make: Idem.
* Instance/rules.make: Remove subproject def file rule.
* Instance/subprojects.make: Remove def file rules.
* Instance/framework.make: Add OBJ_EXT in Info file.
(Based on patch and suggestions by Tom MacSween).


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21722 72102866-910b-0410-8b05-ffd578937521
2005-09-18 20:05:09 +00:00
Nicola Pero
03b646e720 Implemented support for xxx_WINDRES_FILES on mingw32
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21472 72102866-910b-0410-8b05-ffd578937521
2005-07-14 16:20:07 +00:00
Adam Fedor
f7da0d90ea * Update FSF Address.
* Documentation/gnustep-howto.texi: Update required libs.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21244 72102866-910b-0410-8b05-ffd578937521
2005-05-22 03:20:14 +00:00
Nicola Pero
bcf1ca3027 Support xxx_NATIVE_LIBS
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@17927 72102866-910b-0410-8b05-ffd578937521
2003-10-19 14:22:43 +00:00
Nicola Pero
efe8f993d8 Support building in a separate build directory
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@17857 72102866-910b-0410-8b05-ffd578937521
2003-10-13 23:25:23 +00:00
Nicola Pero
f062fbb75d Make ADDITIONAL_INSTALL_DIRS a globally available feature
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@17610 72102866-910b-0410-8b05-ffd578937521
2003-09-03 10:01:24 +00:00
Nicola Pero
04e1995f9c Use ECHO_CREATING when crearing directories
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@16814 72102866-910b-0410-8b05-ffd578937521
2003-05-27 10:19:06 +00:00
Richard Frith-Macdonald
35a9cca20a cat files
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@15895 72102866-910b-0410-8b05-ffd578937521
2003-02-06 08:57:03 +00:00
Richard Frith-Macdonald
ade9790a18 Fixes for subprojects in libraries on windows
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@15893 72102866-910b-0410-8b05-ffd578937521
2003-02-06 07:39:35 +00:00
Nicola Pero
74a3fd8c57 Implemented new xxx_COPY_INTO_DIR framework
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@14888 72102866-910b-0410-8b05-ffd578937521
2002-10-31 13:58:38 +00:00
Nicola Pero
f1b6f12698 Implemented support for XXX_CPPFLAGS, XXX_CFLAGS, XXX_OBJCFLAGS, XXX_CCFLAGS
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@14842 72102866-910b-0410-8b05-ffd578937521
2002-10-25 16:30:47 +00:00
Nicola Pero
a7f75c2138 Tidied: remove comments/newlines
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@14819 72102866-910b-0410-8b05-ffd578937521
2002-10-22 00:25:59 +00:00
Nicola Pero
fdf126f00d Strip the OBJ_FILES_TO_LINK variable so that we can easily know if a bundle
contains an object file or not


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13690 72102866-910b-0410-8b05-ffd578937521
2002-05-23 11:26:10 +00:00
Nicola Pero
3b70393c22 Implemented xxx_STANDARD_INSTALL=no to inhibit standard installation/uninstallation
for that instance to be perfoemd


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13673 72102866-910b-0410-8b05-ffd578937521
2002-05-21 16:13:22 +00:00
Nicola Pero
9be02b2255 Simplified implementation of before-xxx-all and after-xxx-all; implemented
before-xxx-install and after-xxx-install


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13156 72102866-910b-0410-8b05-ffd578937521
2002-03-19 13:06:56 +00:00
Nicola Pero
5ee95b8912 Set up library additional flags here
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13037 72102866-910b-0410-8b05-ffd578937521
2002-03-07 16:20:00 +00:00
Nicola Pero
0c291a7312 Moved declaration of {before,after}-$(GNUSTEP_INSTANCE)-all as .PHONY
inside rules.make


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12885 72102866-910b-0410-8b05-ffd578937521
2002-02-28 14:38:36 +00:00
Nicola Pero
81b81271a5 Moved before-$(GNUSTEP_INSTANCE)-all and after-$(GNUSTEP_INSTANCE)-all into
Instance/rules.make


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12878 72102866-910b-0410-8b05-ffd578937521
2002-02-28 13:09:11 +00:00
Nicola Pero
4b024a922a Do not protect against multiple inclusions
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12472 72102866-910b-0410-8b05-ffd578937521
2002-02-09 15:13:19 +00:00
Nicola Pero
90b242f422 Fixed typo
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12447 72102866-910b-0410-8b05-ffd578937521
2002-02-08 14:41:09 +00:00
Nicola Pero
1995709221 Use the GNUSTEP_INSTANCE variable to access xxx_SUBPROJECTS, xxx_OBJC_FILES
etc, rather than assuming that the Master make has prepared that for us


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12311 72102866-910b-0410-8b05-ffd578937521
2002-01-30 20:50:39 +00:00
Nicola Pero
f730807b8a Generic code setting flags and stating generic compilation rules moved
from Instance/rules.make back to rules.make ... instance specific code
retained inside Instance/rules.make.  I'm slowly figuring out all the bits :-)


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12309 72102866-910b-0410-8b05-ffd578937521
2002-01-30 20:25:40 +00:00