blob: eedbecc9a79cc229aff931c0bcdd19c3b427c5db (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
--- util/Makefile.in.orig 2015-10-06 04:12:09 UTC
+++ util/Makefile.in
@@ -145,14 +145,13 @@ wdwrite_DEPENDENCIES = $(top_builddir)/W
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.$(OBJEXT)
wmiv_OBJECTS = $(am_wmiv_OBJECTS)
-wmiv_DEPENDENCIES = $(top_builddir)/wrlib/libwraster.la \
+wmiv_DEPENDENCIES = \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_wmmenugen_OBJECTS = wmmenugen.$(OBJEXT) wmmenugen_misc.$(OBJEXT) \
@@ -163,8 +162,7 @@ wmmenugen_DEPENDENCIES = $(top_builddir)
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 =
@@ -477,7 +475,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_srcdir)/wrlib \
+ $(DFLAGS) -I$(top_srcdir)/WINGs \
@HEADER_SEARCH_PATH@ \
-DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
@@ -500,13 +498,13 @@ geticonset_LDADD = $(top_builddir)/WINGs
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 = \
@@ -523,7 +521,7 @@ wmmenugen_SOURCES = wmmenugen.c wmmenuge
wmmenugen_parse_xdg.c
wmiv_LDADD = \
- $(top_builddir)/wrlib/libwraster.la \
+ -lwraster \
@XLFLAGS@ @XLIBS@ \
@GFXLIBS@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBEXIF)
|
