diff --git a/bin/Makefile.dynamic b/bin/Makefile.dynamic index f0c40b5..15d4e0a 100644 --- a/bin/Makefile.dynamic +++ b/bin/Makefile.dynamic @@ -5,7 +5,7 @@ # CFLAGS = -I ../lib $(CFLAGSIN) -LDFLAGS = -L ../lib $(LDFLAGSIN) +LDFLAGS = -L ../lib LDLIBS = -lbibutils TOMODS = bibprog.o tomods.o args.o diff --git a/bin/Makefile.dynamic.orig b/bin/Makefile.dynamic.orig deleted file mode 100644 index 15d4e0a..0000000 --- a/bin/Makefile.dynamic.orig +++ /dev/null @@ -1,118 +0,0 @@ -# -# bibutils converters MAKEFILE -# -# dynamic linkage version -# - -CFLAGS = -I ../lib $(CFLAGSIN) -LDFLAGS = -L ../lib -LDLIBS = -lbibutils - -TOMODS = bibprog.o tomods.o args.o - -BIBDIFFIN = bibdiff.o -BIBTEXIN = bib2xml.o -BIBLATEXIN = biblatex2xml.o -COPACIN = copac2xml.o -EBIIN = ebi2xml.o -ENDIN = end2xml.o -ENDXIN = endx2xml.o -ISIIN = isi2xml.o -MEDIN = med2xml.o -MODSCLEAN = modsclean.o -NBIBIN = nbib2xml.o -RISIN = ris2xml.o -WORDIN = wordbib2xml.o - -FROMMODS = bibprog.o args.o - -ADSOUT = xml2ads.o -BIBTEXOUT = xml2bib.o -ENDOUT = xml2end.o -ISIOUT = xml2isi.o -RISOUT = xml2ris.o -WORDOUT = xml2wordbib.o - -PROGS = bib2xml biblatex2xml copac2xml end2xml endx2xml isi2xml med2xml \ - nbib2xml ris2xml ebi2xml wordbib2xml \ - xml2ads xml2bib xml2end xml2isi xml2ris xml2wordbib modsclean - -all: $(PROGS) - -args.o : args.c - $(CC) $^ -DCURR_VERSION="\"$(VERSION)\"" -DCURR_DATE="\"$(DATE)\"" $(CFLAGS) -c -o $@ - -bibdiff : $(TOMODS) $(BIBDIFFIN) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -bib2xml : $(TOMODS) $(BIBTEXIN) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -biblatex2xml : $(TOMODS) $(BIBLATEXIN) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -copac2xml : $(TOMODS) $(COPACIN) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -ebi2xml : $(TOMODS) $(EBIIN) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -end2xml : $(TOMODS) $(ENDIN) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -endx2xml : $(TOMODS) $(ENDXIN) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -isi2xml : $(TOMODS) $(ISIIN) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -med2xml : $(TOMODS) $(MEDIN) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -nbib2xml : $(TOMODS) $(NBIBIN) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -ris2xml : $(TOMODS) $(RISIN) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -wordbib2xml : $(TOMODS) $(WORDIN) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -xml2ads : $(FROMMODS) $(ADSOUT) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -xml2bib : $(FROMMODS) $(BIBTEXOUT) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -xml2end : $(FROMMODS) $(ENDOUT) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -xml2isi : $(FROMMODS) $(ISIOUT) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -xml2ris : $(FROMMODS) $(RISOUT) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -xml2wordbib : $(FROMMODS) $(WORDOUT) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -modsclean : $(TOMODS) $(MODSCLEAN) - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -test: - -install: - mkdir -p $(INSTALLDIR) - @for p in $(PROGS); \ - do ( cp $$p$(EXEEXT) $(INSTALLDIR)/ ); \ - done - -clean: - rm -f *.o core - -realclean: - rm -f *.o core - @for p in $(PROGS); \ - do ( rm -f $$p$(EXEEXT) ); \ - done - diff --git a/lib/Makefile.dynamic b/lib/Makefile.dynamic index 9fd321a..34df616 100644 --- a/lib/Makefile.dynamic +++ b/lib/Makefile.dynamic @@ -1,5 +1,4 @@ CFLAGS = $(CFLAGSIN) -LDFLAGS = $(LDFLAGSIN) LIBTARGET = $(LIBTARGETIN) SIMPLE_OBJS = charsets.o \ @@ -76,12 +75,12 @@ all: $(LIBTARGET) $(CC) $(CFLAGS) -c -o $@ $< libbibutils.so: $(BIBCORE_OBJS) $(BIBUTILS_OBJS) - $(CC) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $(SOFULL) $^ + $(CC) -shared -Wl,-soname,$(SONAME) -o $(SOFULL) $^ ln -sf $(SOFULL) $(SONAME) ln -sf $(SOFULL) libbibutils.so bibutils.dll: $(BIBCORE_OBJS) $(BIBUTILS_OBJS) - $(CC) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^ + $(CC) -shared -Wl,-soname,$(SONAME) -o $@ $^ cp $@ ../bin cp $@ ../test diff --git a/lib/Makefile.dynamic.orig b/lib/Makefile.dynamic.orig deleted file mode 100644 index 34df616..0000000 --- a/lib/Makefile.dynamic.orig +++ /dev/null @@ -1,98 +0,0 @@ -CFLAGS = $(CFLAGSIN) -LIBTARGET = $(LIBTARGETIN) - -SIMPLE_OBJS = charsets.o \ - is_ws.o \ - strsearch.o - -NEWSTR_OBJS = entities.o \ - gb18030.o \ - latex.o \ - str.o \ - str_conv.o \ - unicode.o \ - utf8.o - -CONTAIN_OBJS = fields.o \ - intlist.o \ - slist.o \ - vplist.o \ - xml.o \ - xml_encoding.o - -BIBL_OBJS = bibl.o \ - bu_auth.o \ - iso639_1.o \ - iso639_2.o \ - iso639_3.o \ - marc_auth.o \ - name.o \ - notes.o \ - pages.o \ - reftypes.o \ - serialno.o \ - title.o \ - url.o - -INPUT_OBJS = bibtexin.o bibtextypes.o \ - biblatexin.o bltypes.o \ - copacin.o copactypes.o \ - endin.o endtypes.o \ - endxmlin.o \ - generic.o \ - isiin.o isitypes.o \ - medin.o \ - nbibin.o nbibtypes.o \ - modsin.o modstypes.o marc_auth.o \ - risin.o ristypes.o \ - ebiin.o wordin.o - -OUTPUT_OBJS = adsout.o \ - bibtexout.o \ - endout.o \ - isiout.o \ - modsout.o \ - risout.o \ - wordout.o - -BIBCORE_OBJS = $(SIMPLE_OBJS) \ - $(NEWSTR_OBJS) \ - $(CONTAIN_OBJS) \ - $(BIBL_OBJS) \ - bibcore.o - -BIBUTILS_OBJS = $(INPUT_OBJS) \ - $(OUTPUT_OBJS) \ - bibutils.o - -SONAME=libbibutils.so.$(MAJORVERSION) -SOMINOR=$(MINORVERSION) -SOFULL=$(SONAME).$(SOMINOR) - -all: $(LIBTARGET) - -.c.o: - $(CC) $(CFLAGS) -c -o $@ $< - -libbibutils.so: $(BIBCORE_OBJS) $(BIBUTILS_OBJS) - $(CC) -shared -Wl,-soname,$(SONAME) -o $(SOFULL) $^ - ln -sf $(SOFULL) $(SONAME) - ln -sf $(SOFULL) libbibutils.so - -bibutils.dll: $(BIBCORE_OBJS) $(BIBUTILS_OBJS) - $(CC) -shared -Wl,-soname,$(SONAME) -o $@ $^ - cp $@ ../bin - cp $@ ../test - -install: - echo INSTALLING LIBRARIES TO $(LIBINSTALLDIR) - mkdir -p $(LIBINSTALLDIR) - cp -P $(SOFULL) $(SONAME) $(LIBTARGET) $(LIBINSTALLDIR) - -clean: - rm -f *.o core - -realclean: - rm -f *.o *.a *.so $(SONAME) $(SOFULL) core - -test: diff --git a/test/Makefile.dynamic b/test/Makefile.dynamic index ef866dd..7b945fd 100644 --- a/test/Makefile.dynamic +++ b/test/Makefile.dynamic @@ -3,7 +3,7 @@ # CFLAGS = -I ../lib $(CFLAGSIN) -LDFLAGS = -L ../lib $(LDFLAGSIN) +LDFLAGS = -L ../lib LDLIBS = -lbibutils PROGS = doi_test \ diff --git a/test/Makefile.dynamic.orig b/test/Makefile.dynamic.orig deleted file mode 100644 index 7b945fd..0000000 --- a/test/Makefile.dynamic.orig +++ /dev/null @@ -1,55 +0,0 @@ -# -# bibutils unit tests MAKEFILE -# - -CFLAGS = -I ../lib $(CFLAGSIN) -LDFLAGS = -L ../lib -LDLIBS = -lbibutils - -PROGS = doi_test \ - entities_test \ - intlist_test \ - slist_test \ - str_test \ - utf8_test - -all: $(PROGS) - -entities_test : entities_test.o - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -utf8_test : utf8_test.o - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -doi_test : doi_test.o - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -str_test : str_test.o - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -slist_test : slist_test.o - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -intlist_test : intlist_test.o - $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - -test: $(PROGS) FORCE - ( LD_LIBRARY_PATH="../lib"; \ - export LD_LIBRARY_PATH ; \ - ./str_test; \ - ./slist_test; \ - ./intlist_test; \ - ./entities_test; \ - ./utf8_test; \ - ./doi_test ) - -clean: - rm -f *.o core - -realclean: - rm -f *.o core $(PROGS) - @for p in ${PROGS}; \ - do ( rm -f $$p${EXEEXT} ); \ - done - -FORCE: