X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=bf2b663758bff6ff8e6408406135e63fd18c36a6;hb=3b5a46489f85d20012cff59320d7a43b16a43c99;hp=3f8cc6f3bdb94f1f676bcfc84950f40321ea7d72;hpb=d78eafbc5889e1f4602116cf6627b1f0dc1da100;p=yaz-moved-to-github.git diff --git a/win/makefile b/win/makefile index 3f8cc6f..bf2b663 100644 --- a/win/makefile +++ b/win/makefile @@ -42,7 +42,8 @@ BISON=bison default: all -all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog testprog iconv icu libxml2 libxslt +all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog \ + testprog iconv icu libxml2 libxslt yaz_url NSIS="c:\program files\nsis\makensis.exe" HHC="c:\program files\html help workshop\hhc.exe" @@ -119,6 +120,7 @@ YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond4.lib CLIENT=$(BINDIR)\yaz-client.exe YAZ_ICU=$(BINDIR)\yaz-icu.exe +YAZ_URL=$(BINDIR)\yaz-url.exe ZOOMSH=$(BINDIR)\zoomsh.exe ZTEST=$(BINDIR)\yaz-ztest.exe SC_TEST=$(BINDIR)\sc_test.exe @@ -153,6 +155,8 @@ zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \ $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9) \ $(ZOOMTST10) +yaz_url: $(YAZ_URL) + utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP) testprog: $(TSTLOG) $(TST_TIMING) $(TEST_MUTEX) @@ -342,6 +346,7 @@ YAZ_CLIENT_OBJS= \ $(OBJDIR)\fhistory.obj YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj +YAZ_URL_OBJS= $(OBJDIR)\yaz-url.obj COND_DLL_OBJS= $(OBJDIR)\condvar.obj ZTEST_OBJS= \ @@ -540,7 +545,8 @@ MISC_OBJS= \ $(OBJDIR)\xml_include.obj \ $(OBJDIR)\file_glob.obj \ $(OBJDIR)\thread_id.obj \ - $(OBJDIR)\dirent.obj + $(OBJDIR)\dirent.obj \ + $(OBJDIR)\url.obj Z3950_OBJS= \ $(OBJDIR)\z-date.obj\ @@ -925,6 +931,9 @@ $(YAZ_ICU) : "$(BINDIR)" $(YAZ_ICU_OBJS) $(YAZ_ICU_DLL) $(LINK_PROGRAM) $(ICU_LIBS) $(YAZ_ICU_IMPLIB) $(YAZ_ICU_OBJS) /out:$@ $(MT) -manifest $@.manifest -outputresource:$@;1 +$(YAZ_URL) : "$(BINDIR)" $(YAZ_URL_OBJS) $(YAZ_DLL) + $(LINK_PROGRAM) $(YAZ_URL_OBJS) /out:$@ + $(MT) -manifest $@.manifest -outputresource:$@;1 $(SC_TEST) : "$(BINDIR)" $(SC_TEST_OBJS) $(YAZ_DLL) $(LINK_PROGRAM) $(SC_TEST_OBJS) /out:$@