From 7cb25077a38319bc227088c814f4217e3e63386b Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 18 Mar 2018 23:30:30 +0100 Subject: [PATCH] Also test building assembly files --- tests/binary/Makefile.Darwin | 17 +++++++++++++++-- tests/binary/Makefile.DeforaOS | 17 +++++++++++++++-- tests/binary/Makefile.NetBSD | 18 ++++++++++++++---- tests/binary/Makefile.Windows | 18 ++++++++++++++---- tests/binary/project.conf | 6 +++++- 5 files changed, 63 insertions(+), 13 deletions(-) diff --git a/tests/binary/Makefile.Darwin b/tests/binary/Makefile.Darwin index 79b949e..785f32e 100644 --- a/tests/binary/Makefile.Darwin +++ b/tests/binary/Makefile.Darwin @@ -1,4 +1,4 @@ -TARGETS = $(OBJDIR)test$(EXEEXT) $(OBJDIR)test2$(EXEEXT) $(OBJDIR)test3$(EXEEXT) +TARGETS = $(OBJDIR)test$(EXEEXT) $(OBJDIR)test2$(EXEEXT) $(OBJDIR)test3$(EXEEXT) $(OBJDIR)test4$(EXEEXT) OBJDIR = PREFIX = /usr/local DESTDIR = @@ -34,6 +34,13 @@ test3_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -ldl -lm $(OBJDIR)test3$(EXEEXT): $(test3_OBJS) $(CC) -o $(OBJDIR)test3$(EXEEXT) $(test3_OBJS) $(test3_LDFLAGS) +test4_OBJS = $(OBJDIR)test4.o $(OBJDIR)test4.o +test4_ASFLAGS = $(ASFLAGSF) $(ASFLAGS) +test4_CPPFLAGS = $(CPPFLAGSF) $(CPPFLAGS) + +$(OBJDIR)test4$(EXEEXT): $(test4_OBJS) + $(CC) -o $(OBJDIR)test4$(EXEEXT) $(test4_OBJS) $(test4_LDFLAGS) + $(OBJDIR)test.o: test.c $(CC) $(test_CFLAGS) -o $(OBJDIR)test.o -c test.c @@ -46,8 +53,14 @@ $(OBJDIR)test2.o: test2.m $(OBJDIR)test3.o: test3.cpp $(CXX) $(test3_CXXFLAGS) -o $(OBJDIR)test3.o -c test3.cpp +$(OBJDIR)test4.o: test4.asm + $(AS) $(test4_ASFLAGS) -o $(OBJDIR)test4.o test4.asm + +$(OBJDIR)test4.o: test4.S + $(AS) $(test4_ASFLAGS) -o $(OBJDIR)test4.o test4.S + clean: - $(RM) -- $(test_OBJS) $(test2_OBJS) $(test3_OBJS) + $(RM) -- $(test_OBJS) $(test2_OBJS) $(test3_OBJS) $(test4_OBJS) distclean: clean $(RM) -- $(TARGETS) diff --git a/tests/binary/Makefile.DeforaOS b/tests/binary/Makefile.DeforaOS index 1894fce..92e31bd 100644 --- a/tests/binary/Makefile.DeforaOS +++ b/tests/binary/Makefile.DeforaOS @@ -1,4 +1,4 @@ -TARGETS = $(OBJDIR)test$(EXEEXT) $(OBJDIR)test2$(EXEEXT) $(OBJDIR)test3$(EXEEXT) +TARGETS = $(OBJDIR)test$(EXEEXT) $(OBJDIR)test2$(EXEEXT) $(OBJDIR)test3$(EXEEXT) $(OBJDIR)test4$(EXEEXT) OBJDIR = PREFIX = /Apps/$(VENDOR) DESTDIR = @@ -34,6 +34,13 @@ test3_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -ldl -lsocket -lm $(OBJDIR)test3$(EXEEXT): $(test3_OBJS) $(CC) -o $(OBJDIR)test3$(EXEEXT) $(test3_OBJS) $(test3_LDFLAGS) +test4_OBJS = $(OBJDIR)test4.o $(OBJDIR)test4.o +test4_ASFLAGS = $(ASFLAGSF) $(ASFLAGS) +test4_CPPFLAGS = $(CPPFLAGSF) $(CPPFLAGS) + +$(OBJDIR)test4$(EXEEXT): $(test4_OBJS) + $(CC) -o $(OBJDIR)test4$(EXEEXT) $(test4_OBJS) $(test4_LDFLAGS) + $(OBJDIR)test.o: test.c $(CC) $(test_CFLAGS) -o $(OBJDIR)test.o -c test.c @@ -46,8 +53,14 @@ $(OBJDIR)test2.o: test2.m $(OBJDIR)test3.o: test3.cpp $(CXX) $(test3_CXXFLAGS) -o $(OBJDIR)test3.o -c test3.cpp +$(OBJDIR)test4.o: test4.asm + $(AS) $(test4_ASFLAGS) -o $(OBJDIR)test4.o test4.asm + +$(OBJDIR)test4.o: test4.S + $(AS) $(test4_ASFLAGS) -o $(OBJDIR)test4.o test4.S + clean: - $(RM) -- $(test_OBJS) $(test2_OBJS) $(test3_OBJS) + $(RM) -- $(test_OBJS) $(test2_OBJS) $(test3_OBJS) $(test4_OBJS) distclean: clean $(RM) -- $(TARGETS) diff --git a/tests/binary/Makefile.NetBSD b/tests/binary/Makefile.NetBSD index 6978ff5..5f8ddfc 100644 --- a/tests/binary/Makefile.NetBSD +++ b/tests/binary/Makefile.NetBSD @@ -1,4 +1,4 @@ -TARGETS = $(OBJDIR)test$(EXEEXT) $(OBJDIR)test2$(EXEEXT) $(OBJDIR)test3$(EXEEXT) +TARGETS = $(OBJDIR)test$(EXEEXT) $(OBJDIR)test2$(EXEEXT) $(OBJDIR)test3$(EXEEXT) $(OBJDIR)test4$(EXEEXT) OBJDIR = PREFIX = /usr/local DESTDIR = @@ -34,6 +34,13 @@ test3_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -lm $(OBJDIR)test3$(EXEEXT): $(test3_OBJS) $(CC) -o $(OBJDIR)test3$(EXEEXT) $(test3_OBJS) $(test3_LDFLAGS) +test4_OBJS = $(OBJDIR)test4.o $(OBJDIR)test4.o +test4_ASFLAGS = $(ASFLAGSF) $(ASFLAGS) +test4_CPPFLAGS = $(CPPFLAGSF) $(CPPFLAGS) + +$(OBJDIR)test4$(EXEEXT): $(test4_OBJS) + $(CC) -o $(OBJDIR)test4$(EXEEXT) $(test4_OBJS) $(test4_LDFLAGS) + $(OBJDIR)test.o: test.c $(CC) $(test_CFLAGS) -o $(OBJDIR)test.o -c test.c @@ -46,11 +53,14 @@ $(OBJDIR)test2.o: test2.m $(OBJDIR)test3.o: test3.cpp $(CXX) $(test3_CXXFLAGS) -o $(OBJDIR)test3.o -c test3.cpp -$(OBJDIR)test.o: test.cpp - $(CXX) $(test3_CXXFLAGS) -o $(OBJDIR)test.o -c test.cpp +$(OBJDIR)test4.o: test4.asm + $(AS) $(test4_ASFLAGS) -o $(OBJDIR)test4.o test4.asm + +$(OBJDIR)test4.o: test4.S + $(AS) $(test4_ASFLAGS) -o $(OBJDIR)test4.o test4.S clean: - $(RM) -- $(test_OBJS) $(test2_OBJS) $(test3_OBJS) + $(RM) -- $(test_OBJS) $(test2_OBJS) $(test3_OBJS) $(test4_OBJS) distclean: clean $(RM) -- $(TARGETS) diff --git a/tests/binary/Makefile.Windows b/tests/binary/Makefile.Windows index 244bd93..9c41eb9 100644 --- a/tests/binary/Makefile.Windows +++ b/tests/binary/Makefile.Windows @@ -1,4 +1,4 @@ -TARGETS = $(OBJDIR)test$(EXEEXT) $(OBJDIR)test2$(EXEEXT) $(OBJDIR)test3$(EXEEXT) +TARGETS = $(OBJDIR)test$(EXEEXT) $(OBJDIR)test2$(EXEEXT) $(OBJDIR)test3$(EXEEXT) $(OBJDIR)test4$(EXEEXT) OBJDIR = PREFIX = /usr/local DESTDIR = @@ -34,6 +34,13 @@ test3_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -lsocket -lm $(OBJDIR)test3$(EXEEXT): $(test3_OBJS) $(CC) -o $(OBJDIR)test3$(EXEEXT) $(test3_OBJS) $(test3_LDFLAGS) +test4_OBJS = $(OBJDIR)test4.o $(OBJDIR)test4.o +test4_ASFLAGS = $(ASFLAGSF) $(ASFLAGS) +test4_CPPFLAGS = $(CPPFLAGSF) $(CPPFLAGS) + +$(OBJDIR)test4$(EXEEXT): $(test4_OBJS) + $(CC) -o $(OBJDIR)test4$(EXEEXT) $(test4_OBJS) $(test4_LDFLAGS) + $(OBJDIR)test.o: test.c $(CC) $(test_CFLAGS) -o $(OBJDIR)test.o -c test.c @@ -46,11 +53,14 @@ $(OBJDIR)test2.o: test2.m $(OBJDIR)test3.o: test3.cpp $(CXX) $(test3_CXXFLAGS) -o $(OBJDIR)test3.o -c test3.cpp -$(OBJDIR)test.o: test.cpp - $(CXX) $(test3_CXXFLAGS) -o $(OBJDIR)test.o -c test.cpp +$(OBJDIR)test4.o: test4.asm + $(AS) $(test4_ASFLAGS) -o $(OBJDIR)test4.o test4.asm + +$(OBJDIR)test4.o: test4.S + $(AS) $(test4_ASFLAGS) -o $(OBJDIR)test4.o test4.S clean: - $(RM) -- $(test_OBJS) $(test2_OBJS) $(test3_OBJS) + $(RM) -- $(test_OBJS) $(test2_OBJS) $(test3_OBJS) $(test4_OBJS) distclean: clean $(RM) -- $(TARGETS) diff --git a/tests/binary/project.conf b/tests/binary/project.conf index afd6ca6..ae9f9e3 100644 --- a/tests/binary/project.conf +++ b/tests/binary/project.conf @@ -1,4 +1,4 @@ -targets=test,test2,test3 +targets=test,test2,test3,test4 dist=Makefile [test] @@ -15,3 +15,7 @@ ldflags=-lobjc type=binary sources=test3.cpp ldflags=-ldl -lsocket -lm + +[test4] +type=binary +sources=test4.asm,test4.S