Attachment #66814 for bug #63417

View | Details | Raw Unified | Return to bug 63417
Collapse All | Expand All




SGMLDIR=$(UDIR)/share/sgml


DIRS=src xmldtd xmlschema 
DOC_DIR=doc




all: elektra.pc

	done


doc: elektra.pc
	for x in ${DOC_DIR}; do (cd "$$x"; $(MAKE) \
		BACKENDS=${BACKENDS} \
		OPTIMIZATIONS="${OPTIMIZATIONS}" \
		DTDVERSION=${DTDVERSION} \
		DOCDIR=${DOCDIR} MANDIR=${MANDIR} SGMLDIR=${SGMLDIR} \
		BINDIR=${BINDIR} LIBDIR=${LIBDIR} \
		UBINDIR=${UBINDIR} ULIBDIR=${ULIBDIR} \
		CONFDIR=${CONFDIR} INCDIR=${INCDIR} $@); \
	done

cleanhere:
	-rm -f *~ elektra.spec elektra.pc svn-commit*
	-find . -name "*~" -o -name ".kdbg*" | xargs rm -f

	cp ChangeLog ${DESTDIR}${DOCDIR}/${NAME}
	cp example/*-convert example/*.xml ${DESTDIR}${DOCDIR}/${NAME}
	cp example/*.c ${DESTDIR}${DOCDIR}/${NAME}-devel/examples/
#	-LD_LIBRARY_PATH='${DESTDIR}${LIBDIR}':"$$LD_LIBRARY_PATH" [ `id -u` -eq "0" ] && kdb set system/sw/kdb/current/schemapath '${DESTDIR}${SGMLDIR}/elektra-${DTDVERSION}/elektra.xsd'

Lines 27-33 Link Here

(-)elektra-0.5.0.4/src/backends/berkeleydb/Makefile (-1 / +1 lines)
27		27
28		28
29	${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}	29	${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}
30	${CC} -shared -fpic -L../.. -lkdb -ldb -o $@ $<	30	${CC} -shared -fpic -L../.. -lelektra -ldb -o $@ $<
31		31
32		32
33		33

Lines 26-32 Link Here

(-)elektra-0.5.0.4/src/backends/filesys/Makefile (-1 / +1 lines)
26		26
27		27
28	${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}	28	${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}
29	${CC} -shared -fpic -lkdb -L../../ -o $@ $<	29	${CC} -shared -fpic -L../../ -lelektra -o $@ $<
30		30
31		31
32		32

Lines 27-33 Link Here

(-)elektra-0.5.0.4/src/backends/fstab/Makefile (-1 / +1 lines)
27		27
28		28
29	${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}	29	${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}
30	${CC} -shared -fpic -L../.. -lkdb -o $@ $<	30	${CC} -shared -fpic -L../.. -lelektra -o $@ $<
31		31
32		32
33		33

Lines 27-33 Link Here

(-)elektra-0.5.0.4/src/backends/gconf/Makefile (-1 / +1 lines)
27		27
28		28
29	${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}	29	${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}
30	${CC} `pkg-config --libs gconf-2.0` -shared -fpic -L../.. -lkdb -o $@ $<	30	${CC} `pkg-config --libs gconf-2.0` -shared -fpic -L../.. -lelektra -o $@ $<
31		31
32		32
33		33

Lines 27-33 Link Here

(-)elektra-0.5.0.4/src/backends/ini/Makefile (-1 / +1 lines)
27		27
28		28
29	${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}	29	${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}
30	${CC} -shared -fpic -L../.. -lkdb -o $@ $<	30	${CC} -shared -fpic -L../.. -lelektra -o $@ $<
31		31
32		32
33		33

Lines 27-33 Link Here

(-)elektra-0.5.0.4/src/backends/template/Makefile (-1 / +1 lines)
27		27
28		28
29	${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}	29	${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}
30	${CC} -shared -fpic -L../.. -lkdb -o $@ $<	30	${CC} -shared -fpic -L../.. -lelektra -o $@ $<
31		31
32		32
33		33

Lines 1209-1215 Link Here

(-)elektra-0.5.0.4/src/kdb.c (-1 / +1 lines)
1209	int loadToolsLib(void) {	1209	int loadToolsLib(void) {
1210	void *dlhandle=0;	1210	void *dlhandle=0;
1211		1211
1212	dlhandle=dlopen("libkdbtools.so",RTLD_LAZY);	1212	dlhandle=dlopen("libelektratools.so",RTLD_LAZY);
1213	if (dlhandle == 0) {	1213	if (dlhandle == 0) {
1214	fprintf(stderr, "kdb: %s\n",dlerror());	1214	fprintf(stderr, "kdb: %s\n",dlerror());
1215	return 1;	1215	return 1;

Lines 231-237 Link Here

(-)elektra-0.5.0.4/src/libkdb.c (-1 / +1 lines)
231	/* load the environment and make us aware of codeset conversions */	231	/* load the environment and make us aware of codeset conversions */
232	setlocale(LC_ALL,"");	232	setlocale(LC_ALL,"");
233		233
234	sprintf(backendlib,"libkdb-%s.so",backendName);	234	sprintf(backendlib,"libelektra-%s.so",backendName);
235	dlhandle=dlopen(backendlib,RTLD_LAZY);	235	dlhandle=dlopen(backendlib,RTLD_LAZY);
236	if (dlhandle == 0) {	236	if (dlhandle == 0) {
237	fprintf(stderr, "libkdb: Could not open \"%s\" backend: %s\n",	237	fprintf(stderr, "libkdb: Could not open \"%s\" backend: %s\n",

Return to bug 63417

Lines 26-35 Link Here

(-)elektra-0.5.0.4/Makefile (-5 / +14 lines)
26	SGMLDIR=$(UDIR)/share/sgml	26	SGMLDIR=$(UDIR)/share/sgml
27		27
28		28
29	DIRS=src xmldtd xmlschema doc	29	DIRS=src xmldtd xmlschema
30		30	DOC_DIR=doc
31
32
33		31
34		32
35	all: elektra.pc	33	all: elektra.pc
Lines 44-49 Link Here
44	done	42	done
45		43
46		44
		45	doc: elektra.pc
		46	for x in ${DOC_DIR}; do (cd "$$x"; $(MAKE) \
		47	BACKENDS=${BACKENDS} \
		48	OPTIMIZATIONS="${OPTIMIZATIONS}" \
		49	DTDVERSION=${DTDVERSION} \
		50	DOCDIR=${DOCDIR} MANDIR=${MANDIR} SGMLDIR=${SGMLDIR} \
		51	BINDIR=${BINDIR} LIBDIR=${LIBDIR} \
		52	UBINDIR=${UBINDIR} ULIBDIR=${ULIBDIR} \
		53	CONFDIR=${CONFDIR} INCDIR=${INCDIR} $@); \
		54	done
		55
47	cleanhere:	56	cleanhere:
48	-rm -f ~ elektra.spec elektra.pc svn-commit	57	-rm -f ~ elektra.spec elektra.pc svn-commit
49	-find . -name "~" -o -name ".kdbg" \| xargs rm -f	58	-find . -name "~" -o -name ".kdbg" \| xargs rm -f
Lines 133-136 Link Here
133	cp ChangeLog ${DESTDIR}${DOCDIR}/${NAME}	142	cp ChangeLog ${DESTDIR}${DOCDIR}/${NAME}
134	cp example/-convert example/.xml ${DESTDIR}${DOCDIR}/${NAME}	143	cp example/-convert example/.xml ${DESTDIR}${DOCDIR}/${NAME}
135	cp example/*.c ${DESTDIR}${DOCDIR}/${NAME}-devel/examples/	144	cp example/*.c ${DESTDIR}${DOCDIR}/${NAME}-devel/examples/
136	-LD_LIBRARY_PATH='${DESTDIR}${LIBDIR}':"$$LD_LIBRARY_PATH" [ `id -u` -eq "0" ] && kdb set system/sw/kdb/current/schemapath '${DESTDIR}${SGMLDIR}/elektra-${DTDVERSION}/elektra.xsd'	145	# -LD_LIBRARY_PATH='${DESTDIR}${LIBDIR}':"$$LD_LIBRARY_PATH" [ `id -u` -eq "0" ] && kdb set system/sw/kdb/current/schemapath '${DESTDIR}${SGMLDIR}/elektra-${DTDVERSION}/elektra.xsd'