gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-22 13:50:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove resrouce files dependancy

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@6728 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 2000-06-19 15:33:26 +00:00
parent 4284b29d52
commit 7512b3df67
4 changed files with 195 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2000-06-19 Adam Fedor <fedor@gnu.org>
* bundle.make (bundle-resource-files): Remove dependancy on
RESOURCE_FILES, which may not exist
* configure.in: Add test for cygwin
2000-06-12 Adam Fedor <fedor@gnu.org>
* GNUmakefile.in: Use perl which_lib script on machines that have it.

2
bundle.make
View file

@ -147,7 +147,7 @@ $(BUNDLE_FILE) : $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) $(OBJ_
endif # WITH_DLL
bundle-resource-files:: $(BUNDLE_DIR_NAME)/Resources/Info.plist $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist $(RESOURCE_FILES)
bundle-resource-files:: $(BUNDLE_DIR_NAME)/Resources/Info.plist $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist
@(if [ "$(RESOURCE_FILES)" != "" ]; then \
echo "Copying resources into the bundle wrapper..."; \
for f in "$(RESOURCE_FILES)"; do \

333
configure vendored
View file

File diff suppressed because it is too large Load diff

19
configure.in
View file

@ -62,6 +62,9 @@ AC_SUBST(GNUSTEP_PREFIX)
#--------------------------------------------------------------------
# Setup the library combination
#--------------------------------------------------------------------
targetArgument=${target}
AC_CANONICAL_SYSTEM
AC_ARG_WITH(library-combo,[
--with-library-combo
Define the default library combinations that will be used when you
@ -91,10 +94,7 @@ AC_SUBST(ac_cv_library_combo)
#--------------------------------------------------------------------
# Determine the host, build, and target systems
#--------------------------------------------------------------------
targetArgument=${target}
AC_CANONICAL_SYSTEM
if test "x`echo x$host|grep mingw32`" != x; then
if test $host_os = mingw32 ; then
echo "hosted on mingw32 .."
export MINGW32=1
export SHELL=zsh
@ -106,6 +106,17 @@ if test "x`echo x$host|grep mingw32`" != x; then
if test "x$program_suffix" = "xNONE"; then
export program_suffix=.exe
fi
elif test $host_os = cygwin; then
echo "hosted on cygwin .."
export MINGW32=0
export CC=${CC:-gcc}
export AR=${AR:-ar}
export RANLIB=${RANLIB:-ranlib}
export DLLTOOL=${DLLTOOL:-dlltool}
export program_suffix=${program_suffix:-.exe}
if test "x$program_suffix" = "xNONE"; then
export program_suffix=.exe
fi
else
export MINGW32=0
fi