Added connect/disconnect/getopt/setopt and handle to xmldb API; Added datastore 'text'; Moved apps/dbctrl to datastore/

datastore/Makefile.in

@@ -31,8 +31,18 @@
 # ***** END LICENSE BLOCK *****
 #
 VPATH       	= @srcdir@
+prefix 		= @prefix@
+datarootdir	= @datarootdir@
 srcdir  	= @srcdir@
 top_srcdir  	= @top_srcdir@
+exec_prefix 	= @exec_prefix@
+bindir 		= @bindir@
+libdir		= @libdir@
+dbdir		= @prefix@/db
+mandir		= @mandir@
+libexecdir	= @libexecdir@
+localstatedir	= @localstatedir@
+sysconfdir	= @sysconfdir@
 CC		= @CC@
 CFLAGS  	= @CFLAGS@ 
 LDFLAGS 	= @LDFLAGS@
@@ -40,7 +50,22 @@ LIBS    	= @LIBS@
 with_restconf	= @with_restconf@
 with_keyvalue	= @with_keyvalue@
 
-SHELL	= /bin/sh
+SH_SUFFIX	= @SH_SUFFIX@
+CLIXON_MAJOR    = @CLIXON_VERSION_MAJOR@
+CLIXON_MINOR    = @CLIXON_VERSION_MINOR@
+
+# Use this clixon lib for linking
+CLIXON_LIB	= libclixon.so.$(CLIXON_MAJOR).$(CLIXON_MINOR)
+
+# For dependency
+LIBDEPS		= $(top_srcdir)/lib/src/$(CLIXON_LIB) 
+
+LIBS    	= -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLIXON_LIB)
+
+CPPFLAGS  	= @CPPFLAGS@
+
+INCLUDES	= -I. -I$(top_srcdir)/lib/src -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
+
 
 SUBDIRS = text
 ifeq ($(with_keyvalue),yes)
@@ -49,7 +74,23 @@ endif
 
 .PHONY: all clean depend install $(SUBDIRS)
 
-all:	$(SUBDIRS)
+APPSRC  = datastore_client.c
+APPOBJ  = $(APPSRC:.c=.o)
+APPL	= datastore_client
+
+all:	$(SUBDIRS) $(APPL)
+
+-include $(DESTDIR)$(datarootdir)/clixon/clixon.mk
+
+.SUFFIXES:
+.SUFFIXES: .c .o
+
+.c.o:
+	$(CC) $(INCLUDES) -D__PROGRAM__=\"$(APPL)\" $(CPPFLAGS) $(CFLAGS) -c $<
+
+$(APPL) : $(APPOBJ) $(LIBDEPS)
+	$(CC) $(LDFLAGS) $(APPOBJ) $(LIBS) -o $@
+
 
 depend:
 	for i in $(SUBDIRS); \
@@ -62,15 +103,19 @@ install-include:
 	for i in $(SUBDIRS); \
 	do (cd $$i ; $(MAKE) $(MFLAGS) $@); done; 
 
-install:
+install: $(APPL)
+	install -d $(DESTDIR)$(bindir)
+	install $(APPL) $(DESTDIR)$(bindir)
 	for i in $(SUBDIRS); \
 	do (cd $$i; $(MAKE) $(MFLAGS) $@); done
 
 uninstall:
+	rm -f $(bindir)/$(APPL)
 	for i in $(SUBDIRS); \
 	do (cd $$i; $(MAKE) $(MFLAGS) $@); done
 
 clean:
+	rm -f *.core $(APPL) $(APPOBJ)
 	for i in $(SUBDIRS); \
 	do (cd $$i; $(MAKE) $(MFLAGS) $@); done