Skip to content

Commit 416eb73

Browse files
authored
Merge pull request #484 from fjtrujy/fixMkdirMakefile
Fix missing mkdir guard in makefiles
2 parents 36be04e + 6c1b152 commit 416eb73

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

ee/libcglue/Makefile

+9
Original file line numberDiff line numberDiff line change
@@ -56,29 +56,38 @@ include $(PS2SDKSRC)/ee/Rules.make
5656
include $(PS2SDKSRC)/ee/Rules.release
5757

5858
$(TIMEZONE_OBJS:%=$(EE_OBJS_DIR)%): $(EE_SRC_DIR)timezone.c
59+
$(DIR_GUARD)
5960
$(EE_C_COMPILE) -DF_$(*:$(EE_OBJS_DIR)%=%) $< -c -o $@
6061

6162
$(SJIS_OBJS:%=$(EE_OBJS_DIR)%): $(EE_SRC_DIR)sjis.c
63+
$(DIR_GUARD)
6264
$(EE_C_COMPILE) -DF_$(*:$(EE_OBJS_DIR)%=%) $< -c -o $@
6365

6466
$(SLEEP_OBJS:%=$(EE_OBJS_DIR)%): $(EE_SRC_DIR)sleep.c
67+
$(DIR_GUARD)
6568
$(EE_C_COMPILE) -DF_$(*:$(EE_OBJS_DIR)%=%) $< -c -o $@
6669

6770
$(GLUE_OBJS:%=$(EE_OBJS_DIR)%): $(EE_SRC_DIR)glue.c
71+
$(DIR_GUARD)
6872
$(EE_C_COMPILE) -DF_$(*:$(EE_OBJS_DIR)%=%) $< -c -o $@
6973

7074
$(CWD_OBJS:%=$(EE_OBJS_DIR)%): $(EE_SRC_DIR)cwd.c
75+
$(DIR_GUARD)
7176
$(EE_C_COMPILE) -DF_$(*:$(EE_OBJS_DIR)%=%) $< -c -o $@
7277

7378
$(PS2SDKAPI_OBJS:%=$(EE_OBJS_DIR)%): $(EE_SRC_DIR)ps2sdkapi.c
79+
$(DIR_GUARD)
7480
$(EE_C_COMPILE) -DF_$(*:$(EE_OBJS_DIR)%=%) $< -c -o $@
7581

7682
$(FDMAN_OBJS:%=$(EE_OBJS_DIR)%): $(EE_SRC_DIR)fdman.c
83+
$(DIR_GUARD)
7784
$(EE_C_COMPILE) -DF_$(*:$(EE_OBJS_DIR)%=%) $< -c -o $@
7885

7986
$(INIT_OBJS:%=$(EE_OBJS_DIR)%): $(EE_SRC_DIR)init.c
87+
$(DIR_GUARD)
8088
$(EE_C_COMPILE) -DF_$(*:$(EE_OBJS_DIR)%=%) $< -c -o $@
8189

8290
$(LOCK_OBJS:%=$(EE_OBJS_DIR)%): $(EE_SRC_DIR)lock.c
91+
$(DIR_GUARD)
8392
$(EE_C_COMPILE) -DF_$(*:$(EE_OBJS_DIR)%=%) $< -c -o $@
8493

ee/libpthreadglue/Makefile

-5
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ TLS_HELPER_OBJS = __keysUsed.o __maxTlsValues.o __globalTlsLock.o __globalTls.o
2222

2323
EE_OBJS = $(OSAL_OBJS) $(TLS_HELPER_OBJS)
2424

25-
# all:: prepareFolder $(EE_LIB)
26-
27-
# prepareFolder:
28-
# $(MKDIR) -p obj
29-
3025
include $(PS2SDKSRC)/Defs.make
3126
include $(PS2SDKSRC)/ee/Rules.lib.make
3227
include $(PS2SDKSRC)/ee/Rules.make

ee/rpc/filexio/Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ include $(PS2SDKSRC)/ee/Rules.make
3232
include $(PS2SDKSRC)/ee/Rules.release
3333

3434
$(FILEXIO_RPC_OBJS:%=$(EE_OBJS_DIR)%): $(EE_SRC_DIR)fileXio_rpc.c
35+
$(DIR_GUARD)
3536
$(EE_C_COMPILE) -DF_$(*:$(EE_OBJS_DIR)%=%) $< -c -o $@
3637

3738
$(FILEXIO_PS2SDK_OBJS:%=$(EE_OBJS_DIR)%): $(EE_SRC_DIR)fileXio_ps2sdk.c
39+
$(DIR_GUARD)
3840
$(EE_C_COMPILE) -DF_$(*:$(EE_OBJS_DIR)%=%) $< -c -o $@

0 commit comments

Comments
 (0)