No comments

diff --git a/src/WOKLibs/Makefile.am b/src/WOKLibs/Makefile.am
index cba2313a4119076e2a8d44934fe84d88f017de93..c13f21b3d9556c670519e990bf47ee66e1979a71 100755 (executable)
--- a/src/WOKLibs/Makefile.am
+++ b/src/WOKLibs/Makefile.am
@@ -29,10 +29,6 @@ libwoktoolscmd_la_LIBADD =../TKWOK/libTKWOK.la $(TK_LIB_SPEC) $(TCL_LIB_SPEC)
 
 libwokutilscmd_la_LIBADD =../TKWOK/libTKWOK.la $(TK_LIB_SPEC) $(TCL_LIB_SPEC)
 
-woksh_LDADD =../TKWOKTcl/libTKWOKTcl.la ../TKWOK/libTKWOK.la $(TK_LIB_SPEC) $(TCL_LIB_SPEC)
-
-wokprocess_LDADD =../TKWOKTcl/libTKWOKTcl.la ../TKWOK/libTKWOK.la $(TK_LIB_SPEC) $(TCL_LIB_SPEC)
-
 libmscmd_la_LIBADD =../TKWOK/libTKWOK.la $(TK_LIB_SPEC) $(TCL_LIB_SPEC)
 
 libwokdeliverysteps_la_SOURCES = wokdeliverysteps.cxx

diff --git a/src/WOKLibs/Makefile.in b/src/WOKLibs/Makefile.in
index 2a5d7e188a9b82f48067ddff5bf31e8a99508fa7..71d8f22f19da38d0b353f8320b00304da895fdb5 100755 (executable)
--- a/src/WOKLibs/Makefile.in
+++ b/src/WOKLibs/Makefile.in
@@ -118,29 +118,74 @@ srcdir = @srcdir@
 VPATH = @srcdir@ : @top_srcdir@/src/WOKLibs
 
 
-INCLUDES = $(CSF_SOCKETLibs_INCLUDES) $(CSF_FPELibs_INCLUDES) $(CSF_advapi32_INCLUDES) $(CSF_gdi32_INCLUDES) $(CSF_user32_INCLUDES)  -I@top_srcdir@/inc -I@top_srcdir@/src/WOKLibs -I@top_srcdir@/src/WOKLibs
+INCLUDES = $(CSF_SOCKETLibs_INCLUDES) $(CSF_FPELibs_INCLUDES) $(CSF_advapi32_INCLUDES) $(CSF_gdi32_INCLUDES) $(CSF_user32_INCLUDES)  -I@top_srcdir@/inc -I@top_srcdir@/src/WOKLibs
 
 
-bin_PROGRAMS = WOKLibs
+lib_LTLIBRARIES = libwokcmd.la libwokdeliverysteps.la libwokdfltsteps.la libwokobjssteps.la libwokorbixsteps.la libwoksteps.la libwoktoolscmd.la libwokutilscmd.la libmscmd.la
 
-WOKLibs_SOURCES = mscmd.cxx wokcmd.cxx wokdeliverysteps.cxx wokdfltsteps.cxx wokobjssteps.cxx wokorbixsteps.cxx woksteps.cxx woktoolscmd.cxx wokutilscmd.cxx
 
+libwokdeliverysteps_la_LIBADD = ../TKWOK/libTKWOK.la $(TK_LIB_SPEC) $(TCL_LIB_SPEC)
 
-WOKLibs_LDADD =  ../TKernel/libTKernel.la ../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_SOCKETLibs_LIB) $(CSF_FPELibs_LIB) $(CSF_advapi32_LIB) $(CSF_gdi32_LIB) $(CSF_user32_LIB) 
+libwokcmd_la_LIBADD = ../TKWOK/libTKWOK.la $(TK_LIB_SPEC) $(TCL_LIB_SPEC)
 
+libwokdfltsteps_la_LIBADD = ../TKWOK/libTKWOK.la $(TK_LIB_SPEC) $(TCL_LIB_SPEC)
+
+libwokobjssteps_la_LIBADD = ../TKWOK/libTKWOK.la $(TK_LIB_SPEC) $(TCL_LIB_SPEC)
+
+libwokorbixsteps_la_LIBADD = ../TKWOK/libTKWOK.la $(TK_LIB_SPEC) $(TCL_LIB_SPEC)
+
+libwoksteps_la_LIBADD = ../TKWOK/libTKWOK.la $(TK_LIB_SPEC) $(TCL_LIB_SPEC)
+
+libwoktoolscmd_la_LIBADD = ../TKWOK/libTKWOK.la $(TK_LIB_SPEC) $(TCL_LIB_SPEC)
+
+libwokutilscmd_la_LIBADD = ../TKWOK/libTKWOK.la $(TK_LIB_SPEC) $(TCL_LIB_SPEC)
+
+libmscmd_la_LIBADD = ../TKWOK/libTKWOK.la $(TK_LIB_SPEC) $(TCL_LIB_SPEC)
+
+libwokdeliverysteps_la_SOURCES = wokdeliverysteps.cxx
+libwokcmd_la_SOURCES = wokcmd.cxx
+libwokdfltsteps_la_SOURCES = wokdfltsteps.cxx
+libwokobjssteps_la_SOURCES = wokobjssteps.cxx
+libwokorbixsteps_la_SOURCES = wokorbixsteps.cxx
+libwoksteps_la_SOURCES = woksteps.cxx
+libwoktoolscmd_la_SOURCES = woktoolscmd.cxx
+libwokutilscmd_la_SOURCES = wokutilscmd.cxx
+libmscmd_la_SOURCES = mscmd.cxx
 mkinstalldirs = $(SHELL) $(top_srcdir)/make/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
-PROGRAMS =  $(bin_PROGRAMS)
+LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I../..
 CPPFLAGS = @CPPFLAGS@
-WOKLibs_OBJECTS =  mscmd.o wokcmd.o wokdeliverysteps.o wokdfltsteps.o \
-wokobjssteps.o wokorbixsteps.o woksteps.o woktoolscmd.o wokutilscmd.o
-WOKLibs_DEPENDENCIES =  ../TKernel/libTKernel.la ../TKWOK/libTKWOK.la \
-../TKWOKTcl/libTKWOKTcl.la
-WOKLibs_LDFLAGS = 
+libwokcmd_la_LDFLAGS = 
+libwokcmd_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la
+libwokcmd_la_OBJECTS =  wokcmd.lo
+libwokdeliverysteps_la_LDFLAGS = 
+libwokdeliverysteps_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la
+libwokdeliverysteps_la_OBJECTS =  wokdeliverysteps.lo
+libwokdfltsteps_la_LDFLAGS = 
+libwokdfltsteps_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la
+libwokdfltsteps_la_OBJECTS =  wokdfltsteps.lo
+libwokobjssteps_la_LDFLAGS = 
+libwokobjssteps_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la
+libwokobjssteps_la_OBJECTS =  wokobjssteps.lo
+libwokorbixsteps_la_LDFLAGS = 
+libwokorbixsteps_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la
+libwokorbixsteps_la_OBJECTS =  wokorbixsteps.lo
+libwoksteps_la_LDFLAGS = 
+libwoksteps_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la
+libwoksteps_la_OBJECTS =  woksteps.lo
+libwoktoolscmd_la_LDFLAGS = 
+libwoktoolscmd_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la
+libwoktoolscmd_la_OBJECTS =  woktoolscmd.lo
+libwokutilscmd_la_LDFLAGS = 
+libwokutilscmd_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la
+libwokutilscmd_la_OBJECTS =  wokutilscmd.lo
+libmscmd_la_LDFLAGS = 
+libmscmd_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la
+libmscmd_la_OBJECTS =  mscmd.lo
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -156,8 +201,8 @@ GZIP_ENV = --best
 DEP_FILES =  .deps/mscmd.P .deps/wokcmd.P .deps/wokdeliverysteps.P \
 .deps/wokdfltsteps.P .deps/wokobjssteps.P .deps/wokorbixsteps.P \
 .deps/woksteps.P .deps/woktoolscmd.P .deps/wokutilscmd.P
-SOURCES = $(WOKLibs_SOURCES)
-OBJECTS = $(WOKLibs_OBJECTS)
+SOURCES = $(libwokcmd_la_SOURCES) $(libwokdeliverysteps_la_SOURCES) $(libwokdfltsteps_la_SOURCES) $(libwokobjssteps_la_SOURCES) $(libwokorbixsteps_la_SOURCES) $(libwoksteps_la_SOURCES) $(libwoktoolscmd_la_SOURCES) $(libwokutilscmd_la_SOURCES) $(libmscmd_la_SOURCES)
+OBJECTS = $(libwokcmd_la_OBJECTS) $(libwokdeliverysteps_la_OBJECTS) $(libwokdfltsteps_la_OBJECTS) $(libwokobjssteps_la_OBJECTS) $(libwokorbixsteps_la_OBJECTS) $(libwoksteps_la_OBJECTS) $(libwoktoolscmd_la_OBJECTS) $(libwokutilscmd_la_OBJECTS) $(libmscmd_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -170,29 +215,29 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-binPROGRAMS:
+mostlyclean-libLTLIBRARIES:
 
-clean-binPROGRAMS:
-       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+clean-libLTLIBRARIES:
+       -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 
-distclean-binPROGRAMS:
+distclean-libLTLIBRARIES:
 
-maintainer-clean-binPROGRAMS:
+maintainer-clean-libLTLIBRARIES:
 
-install-binPROGRAMS: $(bin_PROGRAMS)
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(bindir)
-       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+       $(mkinstalldirs) $(DESTDIR)$(libdir)
+       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
          if test -f $$p; then \
-           echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-           $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+           echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
+           $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
          else :; fi; \
        done
 
-uninstall-binPROGRAMS:
+uninstall-libLTLIBRARIES:
        @$(NORMAL_UNINSTALL)
-       list='$(bin_PROGRAMS)'; for p in $$list; do \
-         rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+       list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
        done
 
 .s.o:
@@ -227,9 +272,32 @@ distclean-libtool:
 
 maintainer-clean-libtool:
 
-WOKLibs: $(WOKLibs_OBJECTS) $(WOKLibs_DEPENDENCIES)
-       @rm -f WOKLibs
-       $(CXXLINK) $(WOKLibs_LDFLAGS) $(WOKLibs_OBJECTS) $(WOKLibs_LDADD) $(LIBS)
+libwokcmd.la: $(libwokcmd_la_OBJECTS) $(libwokcmd_la_DEPENDENCIES)
+       $(CXXLINK) -rpath $(libdir) $(libwokcmd_la_LDFLAGS) $(libwokcmd_la_OBJECTS) $(libwokcmd_la_LIBADD) $(LIBS)
+
+libwokdeliverysteps.la: $(libwokdeliverysteps_la_OBJECTS) $(libwokdeliverysteps_la_DEPENDENCIES)
+       $(CXXLINK) -rpath $(libdir) $(libwokdeliverysteps_la_LDFLAGS) $(libwokdeliverysteps_la_OBJECTS) $(libwokdeliverysteps_la_LIBADD) $(LIBS)
+
+libwokdfltsteps.la: $(libwokdfltsteps_la_OBJECTS) $(libwokdfltsteps_la_DEPENDENCIES)
+       $(CXXLINK) -rpath $(libdir) $(libwokdfltsteps_la_LDFLAGS) $(libwokdfltsteps_la_OBJECTS) $(libwokdfltsteps_la_LIBADD) $(LIBS)
+
+libwokobjssteps.la: $(libwokobjssteps_la_OBJECTS) $(libwokobjssteps_la_DEPENDENCIES)
+       $(CXXLINK) -rpath $(libdir) $(libwokobjssteps_la_LDFLAGS) $(libwokobjssteps_la_OBJECTS) $(libwokobjssteps_la_LIBADD) $(LIBS)
+
+libwokorbixsteps.la: $(libwokorbixsteps_la_OBJECTS) $(libwokorbixsteps_la_DEPENDENCIES)
+       $(CXXLINK) -rpath $(libdir) $(libwokorbixsteps_la_LDFLAGS) $(libwokorbixsteps_la_OBJECTS) $(libwokorbixsteps_la_LIBADD) $(LIBS)
+
+libwoksteps.la: $(libwoksteps_la_OBJECTS) $(libwoksteps_la_DEPENDENCIES)
+       $(CXXLINK) -rpath $(libdir) $(libwoksteps_la_LDFLAGS) $(libwoksteps_la_OBJECTS) $(libwoksteps_la_LIBADD) $(LIBS)
+
+libwoktoolscmd.la: $(libwoktoolscmd_la_OBJECTS) $(libwoktoolscmd_la_DEPENDENCIES)
+       $(CXXLINK) -rpath $(libdir) $(libwoktoolscmd_la_LDFLAGS) $(libwoktoolscmd_la_OBJECTS) $(libwoktoolscmd_la_LIBADD) $(LIBS)
+
+libwokutilscmd.la: $(libwokutilscmd_la_OBJECTS) $(libwokutilscmd_la_DEPENDENCIES)
+       $(CXXLINK) -rpath $(libdir) $(libwokutilscmd_la_LDFLAGS) $(libwokutilscmd_la_OBJECTS) $(libwokutilscmd_la_LIBADD) $(LIBS)
+
+libmscmd.la: $(libmscmd_la_OBJECTS) $(libmscmd_la_DEPENDENCIES)
+       $(CXXLINK) -rpath $(libdir) $(libmscmd_la_LDFLAGS) $(libmscmd_la_OBJECTS) $(libmscmd_la_LIBADD) $(LIBS)
 .cxx.o:
        $(CXXCOMPILE) -c $<
 .cxx.lo:
@@ -343,7 +411,7 @@ check-am: all-am
 check: check-am
 installcheck-am:
 installcheck: installcheck-am
-install-exec-am: install-binPROGRAMS
+install-exec-am: install-libLTLIBRARIES
 install-exec: install-exec-am
 
 install-data-am:
@@ -352,14 +420,14 @@ install-data: install-data-am
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-libLTLIBRARIES
 uninstall: uninstall-am
-all-am: Makefile $(PROGRAMS)
+all-am: Makefile $(LTLIBRARIES)
 all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
-       $(mkinstalldirs)  $(DESTDIR)$(bindir)
+       $(mkinstalldirs)  $(DESTDIR)$(libdir)
 
 
 mostlyclean-generic:
@@ -371,25 +439,25 @@ distclean-generic:
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
+mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
                mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
                mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
+clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
                clean-depend clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
-               distclean-tags distclean-depend distclean-generic \
-               clean-am
+distclean-am:  distclean-libLTLIBRARIES distclean-compile \
+               distclean-libtool distclean-tags distclean-depend \
+               distclean-generic clean-am
        -rm -f libtool
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-binPROGRAMS \
+maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
                maintainer-clean-compile maintainer-clean-libtool \
                maintainer-clean-tags maintainer-clean-depend \
                maintainer-clean-generic distclean-am
@@ -398,19 +466,19 @@ maintainer-clean-am:  maintainer-clean-binPROGRAMS \
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
+clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
+uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
+distclean-compile clean-compile maintainer-clean-compile \
+mostlyclean-libtool distclean-libtool clean-libtool \
+maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.