# HG changeset patch
# User Tassilo Philipp
# Date 1663759535 -7200
# Node ID 22e4e3f06797f45f9935caca517af2d30c017688
# Parent  1539ebfabebb5beabdb75b9c0a5ddd3eda5aac8c
tests:
- removed stale test/sharedlib (which built a dll, but is unused now, dynload_plain prob used it but provides such libs itself, now)
- sync'ed some embedded Makefiles w/ generic ones
- suite3: fixed C++ flags

diff -r 1539ebfabebb -r 22e4e3f06797 test/call_suite/Makefile.embedded
--- a/test/call_suite/Makefile.embedded	Wed Sep 21 10:54:29 2022 +0200
+++ b/test/call_suite/Makefile.embedded	Wed Sep 21 13:25:35 2022 +0200
@@ -5,15 +5,15 @@
 BLDDIR 	= ${SRCDIR}
 LUA	= lua
 
-CPPFLAGS	+= -I${SRCDIR}/dyncall
-LDFLAGS		+= -L${BLDDIR}/dyncall
-LDLIBS		+= -ldyncall_s
+CFLAGS	+= -I${SRCDIR}/dyncall
+LDFLAGS	+= -L${BLDDIR}/dyncall
+LDLIBS	+= -ldyncall_s
 
 .PHONY: all clean config config-random
 
 all: ${TARGET}
 call_suite: ${OBJS}
-	${CC} ${OBJS} ${LDFLAGS} ${LDLIBS} -o $@
+	${CC} ${CFLAGS} ${LDFLAGS} ${OBJS} ${LDLIBS} -o $@
 config:
 	${LUA} mk-cases.lua <design.txt >cases.h
 config-random: 
diff -r 1539ebfabebb -r 22e4e3f06797 test/call_suite_aggrs/Makefile.embedded
--- a/test/call_suite_aggrs/Makefile.embedded	Wed Sep 21 10:54:29 2022 +0200
+++ b/test/call_suite_aggrs/Makefile.embedded	Wed Sep 21 13:25:35 2022 +0200
@@ -5,15 +5,15 @@
 BLDDIR 	= ${SRCDIR}
 LUA	= lua
 
-CPPFLAGS	+= -I${SRCDIR}/dyncall
-LDFLAGS		+= -L${BLDDIR}/dyncall
-LDLIBS		+= -ldyncall_s
+CFLAGS	+= -I${SRCDIR}/dyncall
+LDFLAGS	+= -L${BLDDIR}/dyncall
+LDLIBS	+= -ldyncall_s
 
 .PHONY: all clean config config-random
 
 all: ${TARGET}
 call_suite_aggrs: ${OBJS}
-	${CC} ${OBJS} ${LDFLAGS} ${LDLIBS} -o $@
+	${CC} ${CFLAGS} ${LDFLAGS} ${OBJS} ${LDLIBS} -o $@
 config:
 	${LUA} mk-cases.lua <design.txt >cases.h
 config-random: 
diff -r 1539ebfabebb -r 22e4e3f06797 test/call_suite_aggrs/Makefile.generic
--- a/test/call_suite_aggrs/Makefile.generic	Wed Sep 21 10:54:29 2022 +0200
+++ b/test/call_suite_aggrs/Makefile.generic	Wed Sep 21 13:25:35 2022 +0200
@@ -8,7 +8,7 @@
 .PHONY: all clean install config config-random
 all: ${APP}
 ${APP}: ${OBJS} 
-	${CC} ${CFLAGS} ${LDFLAGS} ${OBJS} ${LDLIBS} -o ${APP} 
+	${CC} ${CFLAGS} ${LDFLAGS} ${OBJS} ${LDLIBS} -o ${APP}
 clean:
 	rm -f ${APP} ${OBJS}
 install:
diff -r 1539ebfabebb -r 22e4e3f06797 test/sharedlib/CMakeLists.txt
--- a/test/sharedlib/CMakeLists.txt	Wed Sep 21 10:54:29 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-add_library(sharedlib SHARED sharedlib.c)
-target_link_libraries(sharedlib dynload_s)
diff -r 1539ebfabebb -r 22e4e3f06797 test/sharedlib/Makefile.embedded
--- a/test/sharedlib/Makefile.embedded	Wed Sep 21 10:54:29 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-MAKEFILE  = Makefile.embedded
-MAKE_CMD  = ${MAKE} -f ${MAKEFILE}
-TARGET    = libsharedlib.so
-OBJS      = sharedlib.o
-CPPFLAGS += -I../../dynload
-LDFLAGS  += -L../../dynload
-LDLIBS   += -ldynload_s
-
-${TARGET}: ${OBJS}
-	${CC} -shared -o $@ $? ${LDFLAGS} ${LDLIBS}
-all: ${TARGET}
-clean:
-	rm -f ${TARGET} ${OBJS}
-
-sun-gcc:
-	CC=gcc CFLAGS="${CFLAGS} -fPIC" ${MAKE_CMD} all
diff -r 1539ebfabebb -r 22e4e3f06797 test/sharedlib/sharedlib.c
--- a/test/sharedlib/sharedlib.c	Wed Sep 21 10:54:29 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-
- Package: dyncall
- Library: test
- File: test/sharedlib/sharedlib.c
- Description: 
- License:
-
-   Copyright (c) 2011-2018 Daniel Adler <dadler@uni-goettingen.de>,
-                           Tassilo Philipp <tphilipp@potion-studios.com>
-
-   Permission to use, copy, modify, and distribute this software for any
-   purpose with or without fee is hereby granted, provided that the above
-   copyright notice and this permission notice appear in all copies.
-
-   THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-   WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-   MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-   ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-*/
-
-#include "dynload.h"
-
-DLLib* mylib_load(char const *name)
-{
-  return dlLoadLibrary(name);
-}
diff -r 1539ebfabebb -r 22e4e3f06797 test/suite3/Makefile.generic
--- a/test/suite3/Makefile.generic	Wed Sep 21 10:54:29 2022 +0200
+++ b/test/suite3/Makefile.generic	Wed Sep 21 13:25:35 2022 +0200
@@ -2,7 +2,7 @@
 OBJS      = case.o main.o
 SRCTOP    = ${VPATH}/../..
 BLDTOP    = ../..
-CPPFLAGS += -I${SRCTOP}/dyncall
+CXXFLAGS += -I${SRCTOP}/dyncall
 LDLIBS   += -L${BLDTOP}/dyncall -ldyncall_s
 .PHONY: all clean install
 all: ${APP}