diff --git a/Clib/Makefile-win.SH b/Clib/Makefile-win.SH index 11f90ca1..9db5fcfc 100644 --- a/Clib/Makefile-win.SH +++ b/Clib/Makefile-win.SH @@ -12,7 +12,8 @@ JILCFLAGS = $(CFLAGS) $mtccflags $optimize -DEIF_IL_DLL LN = copy MV = $mv RM = $del -MKDIR_TARGET = $mkdir_target +MAKE = $make +MKDIR = $mkdir LINK = $link32 DLL_FLAGS = $dll_flags DLL_LIBS = $dll_libs @@ -23,39 +24,29 @@ IL_OBJECTS = ILeiffel_curl.$obj .c.$obj: $(CC) -c $(JCFLAGS) $< -all:: lib_dir $output_libraries clean +all:: $output_libraries + $(MAKE) clean standard:: eiffel_curl.lib ileiffel_curl.lib mtstandard:: mteiffel_curl.lib -..$(DIR)spec: - $(MKDIR_TARGET) - -..$(DIR)spec$(DIR)$(ISE_C_COMPILER): ..$(DIR)spec - $(MKDIR_TARGET) - -..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM): ..$(DIR)spec$(DIR)$(ISE_C_COMPILER) - $(MKDIR_TARGET) - -..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib: ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM) - $(MKDIR_TARGET) - -lib_dir: ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib - clean: $(RM) *.$obj $(RM) *.lib eiffel_curl.lib: $(OBJECTS) $alib_line + $(MKDIR) ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib $(MV) $@ ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib$(DIR)$@ mteiffel_curl.lib: $(MT_OBJECTS) $alib_line + $(MKDIR) ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib $(MV) $@ ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib$(DIR)$@ ileiffel_curl.lib: $(IL_OBJECTS) $alib_line + $(MKDIR) ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib $(MV) $@ ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib$(DIR)$@ #Multithreaded targets.