summaryrefslogtreecommitdiff
path: root/cleopatre/application/spidgoahead
diff options
context:
space:
mode:
authorgardasevic2009-10-08 16:12:41 +0000
committergardasevic2009-10-08 16:12:41 +0000
commit233d01959bc7834d8c069b1da2e4a7865d44882e (patch)
tree5f867783bd8598500d153627dadfc7e270515814 /cleopatre/application/spidgoahead
parentfaafae20c138004d15b07a5ab2523edf288c79b7 (diff)
[cleo][spidgoahead] Local Makefile adaption to Cleopatre standards
[cleo][spidgoahead] Local Makefile adaption to Cleopatre standards (final) [cleo][spidgoahead] Local Makefile adaption to Cleopatre standards (local merge) git-svn-id: svn+ssh://pessac/svn/cesar/trunk@6038 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cleopatre/application/spidgoahead')
-rw-r--r--cleopatre/application/spidgoahead/LINUX/Makefile166
1 files changed, 62 insertions, 104 deletions
diff --git a/cleopatre/application/spidgoahead/LINUX/Makefile b/cleopatre/application/spidgoahead/LINUX/Makefile
index 3bcfc47ad1..297da11174 100644
--- a/cleopatre/application/spidgoahead/LINUX/Makefile
+++ b/cleopatre/application/spidgoahead/LINUX/Makefile
@@ -7,16 +7,55 @@
# $Id: Makefile,v 1.2 2002/11/01 16:20:19 mmitchell Exp $
#
-all: compile
-ARCH = libwebs.a
-NAME = webs
+STAT_LIB = libwebs.a
+BIN = webs
+INCPATH = ..
+
+<<<<<<< HEAD:cleopatre/application/spidgoahead/LINUX/Makefile
+
+DEPEND_FILES = ../asp.o ../balloc.o ../base64.o ../cgi.o ../default.o \
+=======
+OBJS = ../asp.o ../balloc.o ../base64.o ../cgi.o ../default.o \
+>>>>>>> fd58d33... [cleo][spidgoahead] Local Makefile adaption to Cleopatre standards (final):cleopatre/application/spidgoahead/LINUX/Makefile
+ ../ejlex.o ../ejparse.o ../form.o \
+ ../h.o ../handler.o ../mime.o ../misc.o ../page.o \
+ ../ringq.o ../rom.o \
+ ../sock.o ../sockGen.o $(SSLPATCHFILE) \
+ ../security.o ../sym.o ../uemf.o ../url.o ../value.o \
+ ../md5c.o ../um.o ../umui.o ../websda.o ../emfdb.o \
+ ../webrom.o ../webs.o ../websuemf.o main.o
+DEPS=$(patsubst %o,%d,$(OBJS));
+
+<<<<<<< HEAD:cleopatre/application/spidgoahead/LINUX/Makefile
+
+ifeq ($(CC_FOR_TARGET),) #direct compile
+=======
+ifeq ($(CC_FOR_TARGET),) # direct compile
+>>>>>>> fd58d33... [cleo][spidgoahead] Local Makefile adaption to Cleopatre standards (final):cleopatre/application/spidgoahead/LINUX/Makefile
+CC=arm-linux-gcc
+AR=arm-linux-ar
+CC_WITH_CFLAGS=$(CC) -I/opt/spidcom/spc300/usr/include -g -Os
+CC_WITHOUT_CFLAGS=$(CC)
+else #compile from buildroot
+CC_WITH_CFLAGS=$(CC)
+CC_WITHOUT_CFLAGS=$(CC_FOR_TARGET)
+endif
+
+EXTRA_CFLAGS= -MMD -DWEBS -DUEMF -DOS="LINUX" -DLINUX $(UMSW) $(DASW) $(SSLSW) $(IFMODSW)
+EXTRA_LDFLAGS = $(SSLLIB) $(IFMODLIB)
+#EXTRA_DFLAGS = -g -Wall
+#OTHERS = -DB_STATS -DB_FILL -DDEBUG
+
+
+all: $(BIN)
+
# User Management switch
UMSW = -DUSER_MANAGEMENT_SUPPORT
# Digest Access switch
-DASW = -DDIGEST_ACCESS_SUPPORT
+#DASW = -DDIGEST_ACCESS_SUPPORT
#
# SSL switches
@@ -24,14 +63,6 @@ DASW = -DDIGEST_ACCESS_SUPPORT
# You must uncomment this line to enable SSL
# SSLPATCHFILE = ../websSSL.o
#
-# Then uncomment these three lines if you are using the RSAREF library
-# and set them to the correct path.
-#
-# SSLINC = /RSASSL/library/include
-# SSLLIB = /RSASSL/library/lib/libsslc.a
-# SSLSW = -DWEBS_SSL_SUPPORT -I$(SSLINC)
-#
-# Or alternatively,
#
# Uncomment these three lines if you are using the OpenSSL library.
# Change the value of SSLINC to the path where your OpenSSL header
@@ -47,109 +78,36 @@ DASW = -DDIGEST_ACCESS_SUPPORT
# IFMODSW = -DWEBS_IF_MODIFIED_SUPPORT
# IFMODLIB = /usr/lib/libm.a
-# Dependencies
-DEPEND_FILES = ../asp.o ../balloc.o ../base64.o ../cgi.o ../default.o \
- ../ejlex.o ../ejparse.o ../form.o \
- ../h.o ../handler.o ../mime.o ../misc.o ../page.o \
- ../ringq.o ../rom.o \
- ../sock.o ../sockGen.o $(SSLPATCHFILE) \
- ../security.o ../sym.o ../uemf.o ../url.o ../value.o \
- ../md5c.o ../um.o ../umui.o ../websda.o ../emfdb.o \
- ../webrom.o ../webs.o ../websuemf.o main.o
-CFLAGS = -DWEBS -DUEMF -DOS="LINUX" -DLINUX $(UMSW) $(DASW) $(SSLSW) $(IFMODSW)
-OTHERS = -DB_STATS -DB_FILL -DDEBUG
-DEBUG = -g -Wall
-IFLAGS = -I..
-LDFLAGS = $(SSLLIB) $(IFMODLIB)
-compile: $(NAME)
#
# Build archive of objects
#
-$(ARCH): $(DEPEND_FILES)
- $(AR) $(ARFLAGS) $(ARCH) $?
+$(STAT_LIB): $(OBJS)
+ $(AR) $(ARFLAGS) $(STAT_LIB) $?
#
# Primary link
#
-$(NAME): Makefile $(ARCH)
- $(CC) -o $(NAME) $(DEBUG) \
- $(CFLAGS) $(IFLAGS) \
- main.o $(ARCH) $(LDFLAGS)
-
-clean:
- rm -f $(NAME) $(ARCH) $(DEPEND_FILES)
-
-#
-# Dependencies
-#
-../asp.o: ../webs.h ../wsIntrn.h ../ej.h ../ejIntrn.h ../uemf.h
-
-../balloc.o: ../balloc.c ../uemf.h
-
-../base64.o: ../base64.c ../webs.h ../wsIntrn.h ../ej.h ../ejIntrn.h ../uemf.h
-
-../cgi.o: ../webs.h ../wsIntrn.h ../uemf.h
-
-../default.o: ../default.c ../webs.h ../wsIntrn.h ../ej.h ../ejIntrn.h ../uemf.h
-
-../ejlex.o: ../ejlex.c ../ej.h ../ejIntrn.h ../uemf.h
-
-../ejparse.o: ../ejparse.c ../ej.h ../ejIntrn.h ../uemf.h
-
-../emfdb.o: ../emfdb.h ../wsIntrn.h ../uemf.h
-
-../form.o: ../form.c ../webs.h ../wsIntrn.h ../ej.h ../ejIntrn.h ../uemf.h
-
-../h.o: ../h.c ../uemf.h
-
-../handler.o: ../handler.c ../webs.h ../wsIntrn.h ../ej.h ../ejIntrn.h ../uemf.h
-
-../md5c.o: ../md5.h ../wsIntrn.h ../uemf.h
-
-../mime.o: ../mime.c ../webs.h ../wsIntrn.h ../ej.h ../ejIntrn.h ../uemf.h
-
-../misc.o: ../misc.c ../uemf.h
-
-../page.o: ../page.c ../webs.h ../wsIntrn.h ../ej.h ../ejIntrn.h ../uemf.h
-
-../ringq.o: ../ringq.c ../uemf.h
-
-../rom.o: ../rom.c ../webs.h ../wsIntrn.h ../ej.h ../ejIntrn.h ../uemf.h
-
-../security.o: ../security.c ../webs.h ../wsIntrn.h ../ej.h ../ejIntrn.h ../uemf.h
-
-../sock.o: ../sock.c ../uemf.h
-
-../sockGen.o: ../sockGen.c ../uemf.h
-
-../sym.o: ../sym.c ../uemf.h
-
-../uemf.o: ../uemf.c ../uemf.h
-
-../um.o: ../webs.h ../wsIntrn.h ../um.h ../uemf.h
-
-../umui.o: ../webs.h ../wsIntrn.h ../um.h ../uemf.h
-
-../url.o: ../url.c ../webs.h ../wsIntrn.h ../ej.h ../ejIntrn.h ../uemf.h
-
-../value.o: ../value.c ../uemf.h
-
-../webrom.o: ../webrom.c ../webs.h ../wsIntrn.h ../uemf.h
-
-../webs.o: ../webs.c ../webs.h ../wsIntrn.h ../ej.h ../ejIntrn.h ../uemf.h
-
-../websda.o: ../webs.h ../wsIntrn.h ../websda.h ../uemf.h
-
-../websuemf.o: ../websuemf.c ../webs.h ../wsIntrn.h ../ej.h ../ejIntrn.h ../uemf.h
-
-../websSSL.o: ../websSSL.c ../websSSL.h ../wsIntrn.h ../ej.h ../ejIntrn.h ../uemf.h
-
-main.o: main.c ../wsIntrn.h ../webs.h ../ej.h ../ejIntrn.h ../uemf.h
+$(BIN): Makefile $(STAT_LIB)
+<<<<<<< HEAD:cleopatre/application/spidgoahead/LINUX/Makefile
+ $(CC_WITHOUT_CFLAGS) -o $(BIN) $(DEBUG) \
+=======
+ $(CC_WITHOUT_CFLAGS) -o $(BIN) $(EXTRA_DFLAGS) \
+>>>>>>> fd58d33... [cleo][spidgoahead] Local Makefile adaption to Cleopatre standards (final):cleopatre/application/spidgoahead/LINUX/Makefile
+ $(EXTRA_CFLAGS) -I$(INCPATH) \
+ main.o $(STAT_LIB) $(EXTRA_LDFLAGS)
#
# Transition rules (add -o to put object in right directory)
#
.c.o:
- cc -c -o $@ $(DEBUG) $(CFLAGS) $(IFLAGS) $<
+ $(CC_WITHOUT_CFLAGS) -c -o $@ $(EXTRA_DFLAGS) $(EXTRA_CFLAGS) -I$(INCPATH) $<
+
+
+clean:
+<<<<<<< HEAD:cleopatre/application/spidgoahead/LINUX/Makefile
+ rm -f $(BIN) $(STAT_LIB) $(DEPEND_FILES)
+=======
+ rm -f $(BIN) $(STAT_LIB) $(OBJS) $(DEPS)
+>>>>>>> fd58d33... [cleo][spidgoahead] Local Makefile adaption to Cleopatre standards (final):cleopatre/application/spidgoahead/LINUX/Makefile