diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-22 22:37:50 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-22 22:37:50 +0100 |
| commit | 9436a026e2e23d207fbdcb9e8bc9b076e3573700 (patch) | |
| tree | adb1937bc90be8869a5f7c9636da84773414eb3b /package/vnc-reflector | |
| parent | 52b1b0100c53b1f8699955df618fcb47744e0a7e (diff) | |
activate GCC cflags check, cleanup FLAGS stuff in OpenADK.
* remove TCFLAGS/TLDFLAGS/TCPPFLAGS and only use
TARGET_CFLAGS/TARGET_LDFLAGS/TARGET_CPPFLAGS, ...
* activate GCC_HONOUR_COPTS and fix all packages to
honour CFLAGS
* use CC_FOR_BUILD, CFLAGS_FOR_BUILD, ... for all
build compilation, remove HOST* variants
* introduce KERNEL_MODULE_FLAGS for external kernel
modules
* mark rpm package as broken, mark syslinux for native builds
only, mark libhugetlb for eglibc/glibc only usage
Diffstat (limited to 'package/vnc-reflector')
| -rw-r--r-- | package/vnc-reflector/Makefile | 5 | ||||
| -rw-r--r-- | package/vnc-reflector/patches/patch-Makefile | 55 |
2 files changed, 56 insertions, 4 deletions
diff --git a/package/vnc-reflector/Makefile b/package/vnc-reflector/Makefile index 72aefd342..2392c9b01 100644 --- a/package/vnc-reflector/Makefile +++ b/package/vnc-reflector/Makefile @@ -23,10 +23,7 @@ $(eval $(call PKG_template,VNC_REFLECTOR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEAS CONFIG_STYLE:= manual INSTALL_STYLE:= manual -TCPPFLAGS+= -I. -TLDFLAGS+= -lz -ljpeg -MAKE_FLAGS+= CC="${TARGET_CC}" CFLAGS="${TCFLAGS} ${TCPPFLAGS} ${TLDFLAGS}" -ALL_TARGET:= default +TARGET_LDFLAGS+= -lz -ljpeg do-install: ${INSTALL_DIR} ${IDIR_VNC_REFLECTOR}/usr/sbin diff --git a/package/vnc-reflector/patches/patch-Makefile b/package/vnc-reflector/patches/patch-Makefile new file mode 100644 index 000000000..8a22ebd96 --- /dev/null +++ b/package/vnc-reflector/patches/patch-Makefile @@ -0,0 +1,55 @@ +--- vnc_reflector.orig/Makefile 2003-04-16 19:32:42.000000000 +0200 ++++ vnc_reflector/Makefile 2011-01-20 14:16:58.854910770 +0100 +@@ -14,10 +14,10 @@ + # + # Variables you might want to edit: CFLAGS, CONFFLAGS + +-IFLAGS = -I. ++CPPFLAGS ?= -I. + + # Production +-CFLAGS = -O2 $(IFLAGS) ++CFLAGS ?= -O2 + # Debug (strict) + #CFLAGS = -g -pedantic -Wall $(IFLAGS) + # Debug (profiling) +@@ -26,10 +26,10 @@ CFLAGS = -O2 $(IFLAGS) + #CFLAGS = -g $(IFLAGS) + + # Use poll(2) syscall in async I/O instead of select(2) +-CONFFLAGS = -DUSE_POLL ++CPPFLAGS += -DUSE_POLL + + # Link with zlib and JPEG libraries +-LDFLAGS = -L/usr/local/lib -lz -ljpeg ++LDFLAGS ?= -L/usr/local/lib -lz -ljpeg + + PROG = vncreflector + +@@ -43,14 +43,14 @@ SRCS = main.c logging.c active.c actions + control.c encode_tight.c decode_hextile.c decode_tight.c fbs_files.c \ + region_more.c + +-CC = gcc ++CC ?= gcc + MAKEDEPEND = makedepend + MAKEDEPFLAGS = -Y + +-default: $(PROG) ++all: $(PROG) + + $(PROG): $(OBJS) +- $(CC) $(CFLAGS) -o $(PROG) $(OBJS) $(LDFLAGS) ++ $(CC) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS) + + clean: + rm -f $(OBJS) *core* ./*~ ./*.bak $(PROG) +@@ -59,7 +59,7 @@ depend: $(SRCS) + $(MAKEDEPEND) $(MAKEDEPFLAGS) -I. $(SRCS) 2> /dev/null + + .c.o: +- $(CC) $(CFLAGS) $(CONFFLAGS) -c $< ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< + + + # DO NOT DELETE |