make: address a ci race

would be better to drop the plugins really

diff --git a/Makefile b/Makefile
index e119c55..82993c1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -500,7 +500,10 @@ clean: $(PLAT_CLEAN) clean_plugins
 ifneq ($(PLUGINS),)
 plugins_: $(PLUGINS)
 
-$(PLUGINS):
+plugins/gpulib/gpulib.$(ARCH).a:
+       $(MAKE) -C plugins/gpulib/
+
+$(PLUGINS): plugins/gpulib/gpulib.$(ARCH).a
        $(MAKE) -C $(dir $@)
 
 clean_plugins:

diff --git a/plugins/gpulib/Makefile b/plugins/gpulib/Makefile
index 53aaa88..d4902c2 100644 (file)
--- a/plugins/gpulib/Makefile
+++ b/plugins/gpulib/Makefile
@@ -7,22 +7,16 @@ include ../../config.mak
 
 OBJS += gpu.o prim.o
 
-ifeq "$(ARCH)" "arm"
-OBJS += vout_pl.o
-EXT = a
-else
 #CFLAGS += `sdl-config --cflags`
 #OBJS += vout_sdl.o
 OBJS += vout_pl.o
-EXT = $(ARCH).a
-endif
 CFLAGS += $(PLUGIN_CFLAGS)
 
 # need to compile to another dir, same files are compiled
 # into main binary without PIC
 OBJS2 = $(patsubst %.o,obj/%.o,$(OBJS)) 
 
-TARGET = gpulib.$(EXT)
+TARGET = gpulib.$(ARCH).a
 
 all: ../../config.mak obj $(TARGET)
 

diff --git a/plugins/gpulib/gpulib.mak b/plugins/gpulib/gpulib.mak
index 4e1c659..e861c74 100644 (file)
--- a/plugins/gpulib/gpulib.mak
+++ b/plugins/gpulib/gpulib.mak
@@ -4,17 +4,12 @@
 
 LDFLAGS += -shared -Wl,--no-undefined
 CFLAGS += $(PLUGIN_CFLAGS)
-ifeq "$(ARCH)" "arm"
- EXT =
-else
- #LDLIBS_GPULIB += `sdl-config --libs`
- EXT = .$(ARCH)
-endif
+#LDLIBS_GPULIB += `sdl-config --libs`
 ifdef DEBUG
  CFLAGS += -O0
 endif
 
-GPULIB_A = ../gpulib/gpulib$(EXT).a
+GPULIB_A = ../gpulib/gpulib.$(ARCH).a
 
 ifdef BIN_STANDALONE
 TARGETS += $(BIN_STANDALONE)