--- util/Makefile.in.orig 2020-08-13 06:26:57 UTC +++ util/Makefile.in @@ -154,14 +154,13 @@ wdwrite_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil. wmagnify_SOURCES = wmagnify.c wmagnify_OBJECTS = wmagnify.$(OBJEXT) wmagnify_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \ - $(top_builddir)/WINGs/libWUtil.la \ - $(top_builddir)/wrlib/libwraster.la + $(top_builddir)/WINGs/libWUtil.la am_wmgenmenu_OBJECTS = wmgenmenu.$(OBJEXT) wmgenmenu_OBJECTS = $(am_wmgenmenu_OBJECTS) wmgenmenu_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la am_wmiv_OBJECTS = wmiv-wmiv.$(OBJEXT) wmiv_OBJECTS = $(am_wmiv_OBJECTS) -wmiv_DEPENDENCIES = $(top_builddir)/wrlib/libwraster.la \ +wmiv_DEPENDENCIES = \ $(top_builddir)/WINGs/libWINGs.la wmiv_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(wmiv_CFLAGS) $(CFLAGS) \ @@ -172,8 +171,7 @@ wmmenugen_DEPENDENCIES = $(top_builddir)/WINGs/libWUti wmsetbg_SOURCES = wmsetbg.c wmsetbg_OBJECTS = wmsetbg.$(OBJEXT) wmsetbg_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \ - $(top_builddir)/WINGs/libWUtil.la \ - $(top_builddir)/wrlib/libwraster.la + $(top_builddir)/WINGs/libWUtil.la wxcopy_SOURCES = wxcopy.c wxcopy_OBJECTS = wxcopy.$(OBJEXT) wxcopy_DEPENDENCIES = @@ -502,7 +500,7 @@ AUTOMAKE_OPTIONS = bin_SCRIPTS = wmaker.inst wm-oldmenu2new wkdemenu.pl EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wkdemenu.pl AM_CPPFLAGS = \ - $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_builddir)/wrlib \ + $(DFLAGS) -I$(top_srcdir)/WINGs \ @HEADER_SEARCH_PATH@ \ -DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\" @@ -525,13 +523,13 @@ geticonset_LDADD = $(top_builddir)/WINGs/libWUtil.la $ wmagnify_LDADD = \ $(top_builddir)/WINGs/libWINGs.la \ $(top_builddir)/WINGs/libWUtil.la \ - $(top_builddir)/wrlib/libwraster.la \ + -lwraster \ @XLFLAGS@ @XLIBS@ @INTLIBS@ wmsetbg_LDADD = \ $(top_builddir)/WINGs/libWINGs.la \ $(top_builddir)/WINGs/libWUtil.la \ - $(top_builddir)/wrlib/libwraster.la \ + -lwraster \ @XLFLAGS@ @LIBXINERAMA@ @XLIBS@ @INTLIBS@ wmgenmenu_LDADD = \ @@ -548,7 +546,7 @@ wmmenugen_SOURCES = wmmenugen.c wmmenugen.h wmmenugen_ wmmenugen_parse_xdg.c wmiv_LDADD = \ - $(top_builddir)/wrlib/libwraster.la \ + -lwraster \ $(top_builddir)/WINGs/libWINGs.la \ @XLFLAGS@ @XLIBS@ @GFXLIBS@ \ @PANGO_LIBS@ @PTHREAD_LIBS@ @LIBEXIF@