1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152
|
Description: apply CPPFLAGS when compiling and LDFLAGS when linking
Author: Juhani Numminen <juhaninumminen0@gmail.com>
Forwarded: https://sourceforge.net/p/biosig/code/merge-requests/4/
Last-Update: 2021-01-13
--- a/biosig4c++/Makefile.in
+++ b/biosig4c++/Makefile.in
@@ -512,23 +512,23 @@
%.o: t240/%.c biosig-dev.h gdftime.h physicalunits.h
- $(CC) -c $(DEFINES) $(CFLAGS) -I t240 $(INCPATH) -o "$@" "$<"
+ $(CC) -c $(DEFINES) $(CPPFLAGS) $(CFLAGS) -I t240 $(INCPATH) -o "$@" "$<"
%.c: %.h biosig-dev.h gdftime.h physicalunits.h
%.cpp: %.h biosig-dev.h gdftime.h physicalunits.h
%.o: %.c
- $(CC) -c $(DEFINES) $(CFLAGS) $(INCPATH) -o "$@" "$<"
+ $(CC) -c $(DEFINES) $(CPPFLAGS) $(CFLAGS) $(INCPATH) -o "$@" "$<"
%.o : win32/%.c
- $(CC) -c $(DEFINES) $(CFLAGS) $(INCPATH) -o "$@" "$<"
+ $(CC) -c $(DEFINES) $(CPPFLAGS) $(CFLAGS) $(INCPATH) -o "$@" "$<"
%.o: %.cpp biosig.h biosig-dev.h
- $(CXX) -c $(DEFINES) $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+ $(CXX) -c $(DEFINES) $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
sandbox.o: test0/sandbox.c biosig.h
- $(CXX) -c $(DEFINES) $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+ $(CXX) -c $(DEFINES) $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
win32/%.obj: t240/%.c biosig-dev.h
@@ -577,10 +577,10 @@
#############################################################
gdf.o: biosig.c biosig-dev.h eventcodes.i units.i 11073-10102-AnnexB.i
- $(CC) -c -D=ONLYGDF -D=WITHOUT_NETWORK $(DEFINES) $(CFLAGS) $(INCPATH) -o "$@" "$<"
+ $(CC) -c -D=ONLYGDF -D=WITHOUT_NETWORK $(DEFINES) $(CPPFLAGS) $(CFLAGS) $(INCPATH) -o "$@" "$<"
#getlogin_r.o: win32/getlogin_r.c
-# $(CC) -c $(DEFINES) $(CFLAGS) $(INCPATH) -o "$@" "$<"
+# $(CC) -c $(DEFINES) $(CPPFLAGS) $(CFLAGS) $(INCPATH) -o "$@" "$<"
########### WIN32 ##################
@@ -691,16 +691,16 @@
endif
libbiosig${FULLDLEXT}:$(OBJECTS)
- $(LD) ${SONAME_PREFIX}"$@" $^ $(SHAREDLIB) $(LDFLAGS) $(LDLIBS) -o "$@"
+ $(LD) $(LDFLAGS) ${SONAME_PREFIX}"$@" $^ $(SHAREDLIB) $(LDLIBS) -o "$@"
libgdf${FULLDLEXT}: gdf.o gdftime.o physicalunits.o getlogin.o
- $(LD) ${SONAME_PREFIX}"$@" $^ $(SHAREDLIB) $(LDFLAGS) $(LDLIBS) -o "$@"
+ $(LD) $(LDFLAGS) ${SONAME_PREFIX}"$@" $^ $(SHAREDLIB) $(LDLIBS) -o "$@"
libgdftime${FULLDLEXT}:gdftime.o
- $(LD) ${SONAME_PREFIX}"$@" $^ $(SHAREDLIB) $(LDFLAGS) $(LDLIBS) -o "$@"
+ $(LD) $(LDFLAGS) ${SONAME_PREFIX}"$@" $^ $(SHAREDLIB) $(LDLIBS) -o "$@"
libphysicalunits${FULLDLEXT}:physicalunits.o
- $(LD) ${SONAME_PREFIX}"$@" $^ $(SHAREDLIB) $(LDFLAGS) $(LDLIBS) -o "$@"
+ $(LD) $(LDFLAGS) ${SONAME_PREFIX}"$@" $^ $(SHAREDLIB) $(LDLIBS) -o "$@"
@@ -712,25 +712,25 @@
-$(DELETE) "$@"
$(AR) "$@" "$<"
libphysicalunits.dll: physicalunits.o
- $(LD) -o libphysicalunits.dll -s -shared -fPIC "$<" $(LDLIBS) -Wl,-subsystem,windows,--output-def,libphysicalunits.def,--out-implib,libphysicalunits.dll.a
+ $(LD) $(LDFLAGS) -o libphysicalunits.dll -s -shared -fPIC "$<" $(LDLIBS) -Wl,-subsystem,windows,--output-def,libphysicalunits.def,--out-implib,libphysicalunits.dll.a
#libgdftime.a: gdftime.o
# -$(DELETE) "$@"
# $(AR) "$@" "$<"
#libgdftime.def: gdftime.o
-# $(CC) -o libgdftime.dll -s -shared -fPIC "$@" -Wl,--subsystem,windows,--output-def,libgdftime.def,--out-implib,libgdftime.dll.a
+# $(CC) $(LDFLAGS) -o libgdftime.dll -s -shared -fPIC "$@" -Wl,--subsystem,windows,--output-def,libgdftime.def,--out-implib,libgdftime.dll.a
libgdf.a: gdf.o getlogin.o gdftime.o physicalunits.o
-$(DELETE) "$@"
$(AR) "$@" gdf.o gdftime.o physicalunits.o
libgdf.dll: gdf.o getlogin.o gdftime.o physicalunits.o
- $(LD) -s -shared -fPIC -o libgdf.dll gdf.o getlogin.o gdftime.o physicalunits.o $(LDLIBS) -Wl,-subsystem,windows,--output-def,libgdf.def,--out-implib,libgdf.dll.a
+ $(LD) $(LDFLAGS) -s -shared -fPIC -o libgdf.dll gdf.o getlogin.o gdftime.o physicalunits.o $(LDLIBS) -Wl,-subsystem,windows,--output-def,libgdf.def,--out-implib,libgdf.dll.a
libbiosig.a: $(OBJECTS) libbiosig.pc
-$(DELETE) libbiosig.a
$(AR) libbiosig.a $(OBJECTS)
libbiosig.dll: $(OBJECTS) libbiosig.pc
- $(LD) -o libbiosig.dll -s -shared -fPIC $(OBJECTS) $(LDLIBS) -Wl,-subsystem,windows,--output-def,libbiosig.def,--out-implib,libbiosig.dll.a
+ $(LD) $(LDFLAGS) -o libbiosig.dll -s -shared -fPIC $(OBJECTS) $(LDLIBS) -Wl,-subsystem,windows,--output-def,libbiosig.def,--out-implib,libbiosig.dll.a
libbiosig.pc :
mkdir -p pkgconfig
@@ -753,25 +753,25 @@
## save2gdf, pdp2gdf
%${BINEXT}: %.c libbiosig.$(DLEXT)
- $(CC) $(DEFINES) $(CFLAGS) "$<" -L. -lbiosig -lstdc++ $(LDLIBS) -o "$@"
+ $(CC) $(DEFINES) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) "$<" -L. -lbiosig -lstdc++ $(LDLIBS) -o "$@"
physicalunits${BINEXT} : pu.c physicalunits.o
- $(CC) $(DEFINES) $(CFLAGS) $^ $(LDFLAGS) $(LDLIBS) -o "$@"
+ $(CC) $(DEFINES) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o "$@"
ifeq (1,@HAVE_LIBB64@)
biosig_fhir${BINEXT}: biosig_fhir.c libbiosig.$(DLEXT)
- $(CC) $(DEFINES) $(CFLAGS) "$<" -L. -lbiosig -lstdc++ -lb64 $(LDLIBS) -o "$@"
+ $(CC) $(DEFINES) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) "$<" -L. -lbiosig -lstdc++ -lb64 $(LDLIBS) -o "$@"
else
biosig_fhir${BINEXT}: biosig_fhir.c libb64-1.2.1/src/cencode.c libbiosig.$(DLEXT)
- $(CC) $(DEFINES) $(CFLAGS) -Ilibb64-1.2.1/include/ "$<" libb64-1.2.1/src/cencode.c -L. -lbiosig -lstdc++ $(LDLIBS) -o "$@"
+ $(CC) $(DEFINES) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Ilibb64-1.2.1/include/ "$<" libb64-1.2.1/src/cencode.c -L. -lbiosig -lstdc++ $(LDLIBS) -o "$@"
endif
bscs: biosig_client${BINEXT} biosig_server${BINEXT} sandbox.o biosig.o
biosig_client${BINEXT}: biosig_client.c libbiosig.$(LIBEXT) biosig-network.o
- $(CC) $(CFLAGS) biosig_client.c biosig-network.o libbiosig.$(LIBEXT) $(LDFLAGS) $(LDLIBS) -o "$@"
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) biosig_client.c biosig-network.o libbiosig.$(LIBEXT) $(LDLIBS) -o "$@"
biosig_server${BINEXT}: biosig_server.c libbiosig.$(LIBEXT) biosig-network.o
- $(CC) $(CFLAGS) biosig_server.c biosig-network.o libbiosig.$(LIBEXT) $(LDFLAGS) $(LDLIBS) -o "$@"
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) biosig_server.c biosig-network.o libbiosig.$(LIBEXT) $(LDLIBS) -o "$@"
#############################################################
@@ -877,16 +877,16 @@
ttltrig: bin/ttltrig
bin/ttl2trig : src/ttl2trig.c gdf.o gdftime.o physicalunits.o
mkdir -p ./bin
- $(CC) -D=WITH_BIOSIG $(DEFINE) $(CFLAGS) $^ -Wall -Wextra -lasound $(LDLIBS) -o "$@"
+ $(CC) -D=WITH_BIOSIG $(DEFINE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ -Wall -Wextra -lasound $(LDLIBS) -o "$@"
### FLOWMON
flowmon.o: src/flowmon2.c
- $(CC) -c $(DEFINES) $(CFLAGS) -o "$@" "$<"
+ $(CC) -c $(DEFINES) $(CPPFLAGS) $(CFLAGS) -o "$@" "$<"
flowmon: bin/flowmon
bin/flowmon: flowmon.o gdf.o gdftime.o physicalunits.o
mkdir -p ./bin
- $(CC) $^ $(LDLIBS) -o "$@"
+ $(CC) $(LDFLAGS) $^ $(LDLIBS) -o "$@"
#############################################################
|