Changeset 6733
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile
r6732 r6733 72 72 -f Maketype TYP=$(subst i386,$(shell uname --machine),$(subst cross-,,$@)) \ 73 73 OS_LIBS="-lcrypto" \ 74 DS_OPTS="-O2 -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -Winline -Wall -Wextra" \74 DS_OPTS="-O2 -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO" \ 75 75 DS_CFLAGS="" \ 76 76 DS_LDFLAGS="" \ … … 85 85 -f Maketype TYP=$(subst i386,$(shell uname --machine),$(subst cross-,,$@)) \ 86 86 OS_LIBS="-lcrypto -lrt" \ 87 DS_OPTS="-O0 -ggdb -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -Winline -Wall -Wextra" \87 DS_OPTS="-O0 -ggdb -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO" \ 88 88 DS_CFLAGS="" \ 89 89 DS_LDFLAGS="" \ … … 102 102 LIBUSB="/usr/local/lib/libusb-1.0.a" \ 103 103 OS_LIBS="-lcrypto -lrt" \ 104 DS_OPTS="-O2 -DLIBUSB -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO - Winline -Wall -Wextra -I/usr/local/include" \104 DS_OPTS="-O2 -DLIBUSB -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -I/usr/local/include" \ 105 105 DS_CFLAGS="" \ 106 106 DS_LDFLAGS="" \ … … 121 121 OS_LIBS="-lcrypto" \ 122 122 OS_PTLI="-lpcsclite" \ 123 DS_OPTS="-O2 -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -DHAVE_PCSC=1 -I/usr/include/PCSC -Winline -Wall -Wextra" \123 DS_OPTS="-O2 -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -DHAVE_PCSC=1 -I/usr/include/PCSC" \ 124 124 DS_CFLAGS="" \ 125 125 DS_LDFLAGS="" \ … … 141 141 OS_LIBS="-lcrypto -lrt" \ 142 142 OS_PTLI="-lpcsclite" \ 143 DS_OPTS="-O2 -DLIBUSB -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -DHAVE_PCSC=1 -I/usr/include/PCSC - Winline -Wall -Wextra -I/usr/local/include" \143 DS_OPTS="-O2 -DLIBUSB -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -DHAVE_PCSC=1 -I/usr/include/PCSC -I/usr/local/include" \ 144 144 DS_CFLAGS="" \ 145 145 DS_LDFLAGS="" \ … … 160 160 OS_LIBS="-lcrypto" \ 161 161 OS_PTLI="" \ 162 DS_OPTS="-O2 -DHAVE_PTHREAD_H -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -DHAVE_PCSC=1 -m32 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk - Winline -Wall -Wextra -finline-functions -fomit-frame-pointer" \162 DS_OPTS="-O2 -DHAVE_PTHREAD_H -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -DHAVE_PCSC=1 -m32 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -finline-functions -fomit-frame-pointer" \ 163 163 DS_CFLAGS="" \ 164 164 DS_LDFLAGS="-framework PCSC -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk" \ … … 180 180 OS_LIBS="-lcrypto " \ 181 181 OS_PTLI="" \ 182 DS_OPTS="-O2 -DHAVE_PTHREAD_H -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -DHAVE_PCSC=1 -DLIBUSB -m32 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk - Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -I/usr/local/include" \182 DS_OPTS="-O2 -DHAVE_PTHREAD_H -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -DHAVE_PCSC=1 -DLIBUSB -m32 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -finline-functions -fomit-frame-pointer -I/usr/local/include" \ 183 183 DS_CFLAGS="" \ 184 184 DS_LDFLAGS="-framework PCSC -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation -Wl,-prebind -no-undefined" \ -
trunk/Maketype
r6732 r6733 16 16 override STD_DEFS := -D'CS_SVN_VERSION="$(SVN_REV)"' 17 17 18 # Compiler warnings 19 CC_WARN = -Winline -Wall -Wextra $(EXTRA_CC_WARN) 20 18 21 CC = $(DS_CC) 19 22 AR = $(DS_AR) 20 23 STRIP = $(DS_ST) 21 24 RANLIB = $(DS_RL) 22 CFLAGS = $(STD_DEFS) $( DS_OPTS) $(KFLAG) $(DS_CFLAGS)25 CFLAGS = $(STD_DEFS) $(CC_WARN) $(DS_OPTS) $(KFLAG) $(DS_CFLAGS) 23 26 LDFLAGS = $(STD_DEFS) $(DS_OPTS) $(DS_LDFLAGS) 24 27 ARFLAGS = -rcsl … … 27 30 28 31 GENERAL = Makefile Maketype globals.h oscam-config.h 32 33 # Process EXTRA_xxx variables 34 CC_WARN += $(EXTRA_CC_WARN) 29 35 30 36 ifeq ($(wildcard csgbox), csgbox)
Note:
See TracChangeset
for help on using the changeset viewer.