[Eas-dev-commit] eas/server Makefile,1.8,1.9

[Andrey C. <sku...@us...>]

Update of /cvsroot/eas-dev/eas/server
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30411/server

Modified Files:
	Makefile 
Log Message:
Fix configure for check clip-ui drivers and PAM. By default gtk2 driver is used.

Index: Makefile
===================================================================
RCS file: /cvsroot/eas-dev/eas/server/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	3 Nov 2006 16:12:09 -0000	1.8
+++ Makefile	20 Nov 2006 12:57:55 -0000	1.9
@@ -7,12 +7,12 @@
 include ../Makefile.var
 CLIPINCLUDE= -I$(CLIPROOT)/include
 CLIP = $(CLIPROOT)/bin/clip
-CLIPLIBS  = -L$(CLIPROOT)/lib -lclip-codb -lcodb_query -lclip-ui -lclip-xml -lexpat
+CLIPLIBS  = -L$(CLIPROOT)/lib -lclip-codb -lcodb-query -lclip-ui -lclip-xml -lexpat
 EASLIBS   = -leas
-CLIPFLAGS = -a -O -b
+CLIPFLAGS = -aObw $(BUILDFLAGS)
 AUTHLIBS  = -lpam
 CC = gcc
-CFLAGS = -O
+CFLAGS = -O -Wall
 
 .SUFFIXES: .prg .o .po
 .PHONY: all clean
@@ -34,7 +34,7 @@
 	cat easserver.ini.in | sed -e 's|BINROOT|$(EASBINDIR)|g;s|SERVERROOT|$(EASLOGDIR)|g' >easserver.ini
 
 $(PRG): $(OBJS)
-	$(CLIP) $(CLIPFLAGS) -eslM $(CLIPINCLUDE) -o $(PRG) $(OBJS) $(CLIPLIBS) $(EASLIBS)
+	$(CLIP) $(CLIPFLAGS) -esl $(CLIPINCLUDE) -o $(PRG) $(OBJS) $(CLIPLIBS) $(EASLIBS)
 
 $(AUTH): pam-auth.c
 	$(CC) $(CFLAGS) -o $(AUTH) pam-auth.c $(AUTHLIBS)
@@ -91,4 +91,4 @@
 	rm -f  $(DESTDIR)/etc/pam.d/easserver >/dev/null 2>&1
 
 .prg.o:
-	$(CLIP) $(CLIPFLAGS) -DEAS_MODULES=\"$(EASDATADIR)/server/\" $(CLIPINCLUDE) $<
+	$(CLIP) -n $(CLIPFLAGS) -DEAS_MODULES=\"$(EASDATADIR)/server/\" $(CLIPINCLUDE) $<