summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordscho <dscho>2002-12-06 16:03:50 +0000
committerdscho <dscho>2002-12-06 16:03:50 +0000
commit4d87189420b6225da7f38aa71aee840d816bd570 (patch)
tree2de78669b8dea0e6f8d6ae4e4d17ff825b5c6a88 /Makefile
parentd60fda117b1d72d12984a07a4444d36a69da639e (diff)
downloadlibtdevnc-4d871894.tar.gz
libtdevnc-4d871894.zip
compiler warnings, contrib directory, new x11vnc from Karl Runge
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile31
1 files changed, 17 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 8d28dfb..67370d3 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ VNCSERVERLIB=-L. -lvncserver -L/usr/local/lib -lz -ljpeg
CXX=g++
CC=gcc
+LINK=gcc
# for Solaris
#EXTRALIBS=-lsocket -lnsl -L/usr/X/lib
@@ -36,6 +37,7 @@ ZRLE_SRCS=zrle.cc rdr/FdInStream.cxx rdr/FdOutStream.cxx rdr/InStream.cxx \
ZRLE_OBJS=zrle.o rdr/FdInStream.o rdr/FdOutStream.o rdr/InStream.o \
rdr/NullOutStream.o rdr/ZlibInStream.o rdr/ZlibOutStream.o
ZRLE_DEF=-DHAVE_ZRLE
+LINK=$(CXX)
%.o: %.cxx
$(CXX) $(CXXFLAGS) -c -o $@ $<
@@ -75,52 +77,53 @@ libvncserver.a: $(OBJS)
translate.o: translate.c tableinit24.c tableinitcmtemplate.c tableinittctemplate.c tabletrans24template.c tabletranstemplate.c
example: example.o libvncserver.a
- $(CC) -o example example.o $(LIBS)
+ $(LINK) -o example example.o $(LIBS)
pnmshow: pnmshow.o libvncserver.a
- $(CC) -o pnmshow pnmshow.o $(LIBS)
+ $(LINK) -o pnmshow pnmshow.o $(LIBS)
mac.o: mac.c 1instance.c
OSXvnc-server: mac.o libvncserver.a
- $(CC) -o OSXvnc-server mac.o $(LIBS) $(OSX_LIBS)
+ $(LINK) -o OSXvnc-server mac.o $(LIBS) $(OSX_LIBS)
-x11vnc.o: x11vnc.c 1instance.c
+x11vnc.o: contrib/x11vnc.c rfb.h 1instance.c Makefile
+ $(CC) $(CFLAGS) -I. -c -o x11vnc.o contrib/x11vnc.c
x11vnc: x11vnc.o libvncserver.a
- $(CC) -g -o x11vnc x11vnc.o $(LIBS) $(XLIBS)
+ $(LINK) -g -o x11vnc x11vnc.o $(LIBS) $(XLIBS)
x11vnc_static: x11vnc.o libvncserver.a
- $(CC) -o x11vnc_static x11vnc.o libvncserver.a /usr/lib/libz.a /usr/lib/libjpeg.a $(XLIBS)
+ $(LINK) -o x11vnc_static x11vnc.o libvncserver.a /usr/lib/libz.a /usr/lib/libjpeg.a $(XLIBS)
#$(LIBS) $(XLIBS)
storepasswd: storepasswd.o d3des.o vncauth.o
- $(CC) -o storepasswd storepasswd.o d3des.o vncauth.o
+ $(LINK) -o storepasswd storepasswd.o d3des.o vncauth.o
sratest: sratest.o
- $(CC) -o sratest sratest.o
+ $(LINK) -o sratest sratest.o
sratest.o: sraRegion.c
$(CC) $(CFLAGS) -DSRA_TEST -c -o sratest.o sraRegion.c
blooptest: blooptest.o libvncserver.a
- $(CC) -o blooptest blooptest.o $(LIBS)
+ $(LINK) -o blooptest blooptest.o $(LIBS)
blooptest.o: example.c rfb.h
$(CC) $(CFLAGS) -DBACKGROUND_LOOP_TEST -c -o blooptest.o example.c
pnmshow24: pnmshow24.o libvncserver.a
- $(CC) -o pnmshow24 pnmshow24.o $(LIBS)
+ $(LINK) -o pnmshow24 pnmshow24.o $(LIBS)
fontsel: fontsel.o libvncserver.a
- $(CC) -o fontsel fontsel.o -L. -lvncserver -lz -ljpeg
+ $(LINK) -o fontsel fontsel.o -L. -lvncserver -lz -ljpeg
vncev: vncev.o libvncserver.a
- $(CC) -o vncev vncev.o -L. -lvncserver -lz -ljpeg
+ $(LINK) -o vncev vncev.o -L. -lvncserver -lz -ljpeg
# Example from Justin
-zippy: zippy.o libvncserver.a
- $(CC) -o zippy zippy.o -L. -lvncserver -lz -ljpeg
+zippy: contrib/zippy.o libvncserver.a
+ $(LINK) -o zippy contrib/zippy.o -L. -lvncserver -lz -ljpeg
clean:
rm -f $(OBJS) *~ core "#"* *.bak *.orig storepasswd.o \