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

Update and un-Win32-ify Cygwin rules.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@28595 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Riccardo Mottola 2009-09-01 23:19:02 +00:00
parent fc924dedbc
commit aa9a2dfcde
5 changed files with 0 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Instance/rules.make
View file

@ -234,14 +234,9 @@ CC_OBJ_FILES = $(addprefix $(GNUSTEP_OBJ_DIR)/,$(CC_OBJS))
ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
WINDRES_OBJS = $(patsubst %.rc,%.rc$(OEXT),$($(GNUSTEP_INSTANCE)_WINDRES_FILES))
WINDRES_OBJ_FILES = $(addprefix $(GNUSTEP_OBJ_DIR)/,$(WINDRES_OBJS))
else
ifeq ($(findstring cygwin, $(GNUSTEP_TARGET_OS)), cygwin)
WINDRES_OBJS = $(patsubst %.rc,%.rc$(OEXT),$($(GNUSTEP_INSTANCE)_WINDRES_FILES))
WINDRES_OBJ_FILES = $(addprefix $(GNUSTEP_OBJ_DIR)/,$(WINDRES_OBJS))
else
WINDRES_OBJ_FILES =
endif
endif
OBJ_FILES = $($(GNUSTEP_INSTANCE)_OBJ_FILES)

2
common.make
View file

@ -793,14 +793,12 @@ endif
ifneq ($(FOUNDATION_LIB), apple)
# Under Win32 paths are so confused this warning is not worthwhile
ifneq ($(findstring mingw, $(GNUSTEP_HOST_OS)), mingw)
ifneq ($(findstring cygwin, $(GNUSTEP_HOST_OS)), cygwin)
ifeq ($(findstring $(GNUSTEP_SYSTEM_TOOLS),$(PATH)),)
$(warning WARNING: Your PATH may not be set up correctly !)
$(warning Please try again after adding "$(GNUSTEP_SYSTEM_TOOLS)" to your path)
endif
endif
endif
endif # code used when FOUNDATION_LIB != apple

5
config.make.in
View file

@ -73,11 +73,6 @@ endif
ifeq (@target_os@,mingw32)
HAS_LN_S = no
endif
# Special case - on cygwin, autoconf sets LN_S to 'ln -s', but then
# that does a recursive copy (ie, cp -r).
ifeq (@target_os@,cygwin)
HAS_LN_S = no
endif
# This is used to remove an existing symlink before creating a new
# one. We don't trust 'ln -s -f' as it's unportable so we remove

13
rules.make
View file

@ -612,19 +612,6 @@ $(GNUSTEP_OBJ_DIR)/%.rc$(OEXT): %.rc
$(ECHO_COMPILING)windres $< $@$(END_ECHO)
endif
#
# Special cygwin specific rules to compile Windows resource files (.rc files)
# into object files. (this is the same rule as mingw32)
#
ifeq ($(findstring cygwin, $(GNUSTEP_TARGET_OS)), cygwin)
# Add the .rc suffix on Windows.
.SUFFIXES: .rc
# A rule to generate a .o file from the .rc file.
$(GNUSTEP_OBJ_DIR)/%.rc$(OEXT): %.rc
$(ECHO_COMPILING)windres $< $@$(END_ECHO)
endif
# The following dummy rules are needed for performance - we need to
# prevent make from spending time trying to compute how/if to rebuild
# the system makefiles! the following rules tell him that these files

3
target.make
View file

@ -49,9 +49,6 @@ ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
-lws2_32 -ladvapi32 -lcomctl32 -luser32 -lcomdlg32 \
-lmpr -lnetapi32 -lm -I. # the -I is a dummy to avoid -lm^M
endif
ifeq ($(findstring cygwin, $(GNUSTEP_TARGET_OS)), cygwin)
TARGET_SYSTEM_LIBS = $(CONFIG_SYSTEM_LIBS) -lm -I.
endif
ifeq ($(findstring solaris, $(GNUSTEP_TARGET_OS)), solaris)
TARGET_SYSTEM_LIBS = $(CONFIG_SYSTEM_LIBS) -lsocket -lnsl -lm
endif