Author: mvidner Date: Tue Nov 13 10:45:16 2007 New Revision: 41993 URL: http://svn.opensuse.org/viewcvs/yast?rev=41993&view=rev Log: Moving active parts of liby2util.rpm into yast2-core.rpm to reduce dependencies (F120312). Added: trunk/core/liby2util-r/ trunk/core/liby2util-r/Makefile.am trunk/core/liby2util-r/src/ trunk/core/liby2util-r/src/Digest.cc - copied unchanged from r41252, trunk/liby2util/src/Digest.cc trunk/core/liby2util-r/src/ExternalDataSource.cc - copied unchanged from r41252, trunk/liby2util/src/ExternalDataSource.cc trunk/core/liby2util-r/src/ExternalProgram.cc - copied unchanged from r41252, trunk/liby2util/src/ExternalProgram.cc trunk/core/liby2util-r/src/Makefile.am trunk/core/liby2util-r/src/MemUsage.cc - copied unchanged from r41252, trunk/liby2util/src/MemUsage.cc trunk/core/liby2util-r/src/PathInfo.cc - copied unchanged from r41252, trunk/liby2util/src/PathInfo.cc trunk/core/liby2util-r/src/Pathname.cc - copied unchanged from r41252, trunk/liby2util/src/Pathname.cc trunk/core/liby2util-r/src/Rep.cc - copied unchanged from r41252, trunk/liby2util/src/Rep.cc trunk/core/liby2util-r/src/Y2SLog.cc - copied unchanged from r41252, trunk/liby2util/src/Y2SLog.cc trunk/core/liby2util-r/src/include/ trunk/core/liby2util-r/src/include/Makefile.am trunk/core/liby2util-r/src/include/y2util/ trunk/core/liby2util-r/src/include/y2util/Digest.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/Digest.h trunk/core/liby2util-r/src/include/y2util/ExternalDataSource.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/ExternalDataSource.h trunk/core/liby2util-r/src/include/y2util/ExternalProgram.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/ExternalProgram.h trunk/core/liby2util-r/src/include/y2util/Makefile.am trunk/core/liby2util-r/src/include/y2util/MemUsage.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/MemUsage.h trunk/core/liby2util-r/src/include/y2util/PathInfo.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/PathInfo.h trunk/core/liby2util-r/src/include/y2util/Pathname.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/Pathname.h trunk/core/liby2util-r/src/include/y2util/Rep.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/Rep.h trunk/core/liby2util-r/src/include/y2util/RepDef.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/RepDef.h trunk/core/liby2util-r/src/include/y2util/Ustring.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/Ustring.h trunk/core/liby2util-r/src/include/y2util/Y2SLog.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/Y2SLog.h trunk/core/liby2util-r/src/include/y2util/miniini.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/miniini.h trunk/core/liby2util-r/src/include/y2util/stringutil.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/stringutil.h trunk/core/liby2util-r/src/include/y2util/y2log.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/y2log.h trunk/core/liby2util-r/src/miniini.cc - copied unchanged from r41252, trunk/liby2util/src/miniini.cc trunk/core/liby2util-r/src/stringutil.cc - copied unchanged from r41252, trunk/liby2util/src/stringutil.cc trunk/core/liby2util-r/src/y2log.cc - copied unchanged from r41252, trunk/liby2util/src/y2log.cc trunk/core/liby2util-r/testsuite/ Added: trunk/core/liby2util-r/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/Makefile.am?rev=41993&view=auto ============================================================================== --- trunk/core/liby2util-r/Makefile.am (added) +++ trunk/core/liby2util-r/Makefile.am Tue Nov 13 10:45:16 2007 @@ -0,0 +1 @@ +SUBDIRS=src Added: trunk/core/liby2util-r/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/src/Makefile.am?rev=41993&view=auto ============================================================================== --- trunk/core/liby2util-r/src/Makefile.am (added) +++ trunk/core/liby2util-r/src/Makefile.am Tue Nov 13 10:45:16 2007 @@ -0,0 +1,31 @@ +# +# Makefile.am for liby2util/src +# + +SUBDIRS = include + +INCLUDES = -I$(srcdir)/include #-I$(oldincludedir)/libxml2 + +AM_LDFLAGS = -L$(libdir) + +AM_CPPFLAGS = -DY2LOG=\"liby2util\" $(DEBUG_FLAGS) -D_GNU_SOURCE -DLOCALEDIR=\"${localedir}\" + +lib_LTLIBRARIES = liby2util.la + +liby2util_la_SOURCES = \ + Digest.cc \ + ExternalDataSource.cc \ + ExternalProgram.cc \ + MemUsage.cc \ + PathInfo.cc \ + Pathname.cc \ + Rep.cc \ + Y2SLog.cc \ + miniini.cc \ + stringutil.cc \ + y2log.cc + + +liby2util_la_LDFLAGS = -version-info 4:0:0 + +liby2util_la_LIBADD = #-lutil -lz $(OPENSSL_LIBS) -lxml2 Added: trunk/core/liby2util-r/src/include/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/src/include/Makefile.am?rev=41993&view=auto ============================================================================== --- trunk/core/liby2util-r/src/include/Makefile.am (added) +++ trunk/core/liby2util-r/src/include/Makefile.am Tue Nov 13 10:45:16 2007 @@ -0,0 +1,34 @@ +# +# Makefile.am for liby2util/src/include +# + +SUBDIRS = y2util + +pkgincludedir = $(includedir) + +# these go to $(pkgincludedir) + +pkginclude_HEADERS = + +#<INSTALL-HEADER-TARGET> + +# Automatically inserted by insert_install_target +# DO NOT REMOVE THE TAGS! + +# Install header files only if different to version already installed - +# prevent unnecessary installations to keep make dependency changes +# and thus rebuilds for dependent packages as low as possible. + +install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) + @list='$(pkginclude_HEADERS)'; \ + for p in $$list; do \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + if ! cmp -s $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; then \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \ + fi \ + done + +#</INSTALL-HEADER-TARGET> Added: trunk/core/liby2util-r/src/include/y2util/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/src/include/y2util/Makefile.am?rev=41993&view=auto ============================================================================== --- trunk/core/liby2util-r/src/include/y2util/Makefile.am (added) +++ trunk/core/liby2util-r/src/include/y2util/Makefile.am Tue Nov 13 10:45:16 2007 @@ -0,0 +1,46 @@ +# +# Makefile.am for liby2util/src/include/y2util +# + +pkgincludedir = $(includedir)/y2util + +# these go to $(pkgincludedir) + +pkginclude_HEADERS = \ + Digest.h \ + ExternalDataSource.h \ + ExternalProgram.h \ + MemUsage.h \ + PathInfo.h \ + Pathname.h \ + Rep.h \ + RepDef.h \ + Ustring.h \ + Y2SLog.h \ + miniini.h \ + stringutil.h \ + y2log.h + + +#<INSTALL-HEADER-TARGET> + +# Automatically inserted by insert_install_target +# DO NOT REMOVE THE TAGS! + +# Install header files only if different to version already installed - +# prevent unnecessary installations to keep make dependency changes +# and thus rebuilds for dependent packages as low as possible. + +install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) + @list='$(pkginclude_HEADERS)'; \ + for p in $$list; do \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + if ! cmp -s $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; then \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \ + fi \ + done + +#</INSTALL-HEADER-TARGET> -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org