mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-29 09:52:29 +01:00
Code update for Window Maker version 0.50.0
Read changes in ChangeLog and NEWS
This commit is contained in:
dan
@@ -67,6 +67,9 @@ I18N = @I18N@
|
||||
I18N_MB = @I18N_MB@
|
||||
ICONEXT = @ICONEXT@
|
||||
INTLIBS = @INTLIBS@
|
||||
LD = @LD@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LITE = @LITE@
|
||||
LN_S = @LN_S@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MOFILES = @MOFILES@
|
||||
@@ -102,7 +105,7 @@ INCLUDES = @DFLAGS@ -I$(top_srcdir)/wrlib -I$(top_srcdir)/libPropList\
|
||||
@XCFLAGS@ @GFXFLAGS@
|
||||
|
||||
# X_EXTRA_LIBS is for libproplist in systems that need -lsocket
|
||||
liblist= -L$(top_builddir)/libPropList -lPropList @X_EXTRA_LIBS@
|
||||
liblist= $(top_builddir)/libPropList/libPropList.la @X_EXTRA_LIBS@
|
||||
|
||||
wdwrite_LDADD = $(liblist)
|
||||
|
||||
@@ -118,8 +121,9 @@ seticons_LDADD= $(liblist)
|
||||
|
||||
geticonset_LDADD= $(liblist)
|
||||
|
||||
wmsetbg_LDADD = -L$(top_builddir)/libPropList -lPropList \
|
||||
-L$(top_builddir)/wrlib -lwraster \
|
||||
wmsetbg_LDADD = $(top_builddir)/libPropList/libPropList.la \
|
||||
$(top_builddir)/wrlib/libwraster.la \
|
||||
$(top_builddir)/WINGs/libWINGs.a \
|
||||
@GFXLFLAGS@ @XLFLAGS@ @GFXLIBS@ @XLIBS@ -lm
|
||||
|
||||
getstyle_SOURCES = getstyle.c
|
||||
@@ -159,28 +163,30 @@ wxpaste_OBJECTS = wxpaste.o
|
||||
wxpaste_DEPENDENCIES =
|
||||
wxpaste_LDFLAGS =
|
||||
wdwrite_OBJECTS = wdwrite.o
|
||||
wdwrite_DEPENDENCIES =
|
||||
wdwrite_DEPENDENCIES = $(top_builddir)/libPropList/libPropList.la
|
||||
wdwrite_LDFLAGS =
|
||||
getstyle_OBJECTS = getstyle.o
|
||||
getstyle_DEPENDENCIES =
|
||||
getstyle_DEPENDENCIES = $(top_builddir)/libPropList/libPropList.la
|
||||
getstyle_LDFLAGS =
|
||||
setstyle_OBJECTS = setstyle.o
|
||||
setstyle_DEPENDENCIES =
|
||||
setstyle_DEPENDENCIES = $(top_builddir)/libPropList/libPropList.la
|
||||
setstyle_LDFLAGS =
|
||||
seticons_OBJECTS = seticons.o
|
||||
seticons_DEPENDENCIES =
|
||||
seticons_DEPENDENCIES = $(top_builddir)/libPropList/libPropList.la
|
||||
seticons_LDFLAGS =
|
||||
geticonset_OBJECTS = geticonset.o
|
||||
geticonset_DEPENDENCIES =
|
||||
geticonset_DEPENDENCIES = $(top_builddir)/libPropList/libPropList.la
|
||||
geticonset_LDFLAGS =
|
||||
wmsetbg_OBJECTS = wmsetbg.o
|
||||
wmsetbg_DEPENDENCIES =
|
||||
wmsetbg_DEPENDENCIES = $(top_builddir)/libPropList/libPropList.la \
|
||||
$(top_builddir)/wrlib/libwraster.la $(top_builddir)/WINGs/libWINGs.a
|
||||
wmsetbg_LDFLAGS =
|
||||
SCRIPTS = $(bin_SCRIPTS)
|
||||
|
||||
CFLAGS = @CFLAGS@
|
||||
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
|
||||
LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
|
||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
|
||||
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
|
||||
DIST_COMMON = README Makefile.am Makefile.in
|
||||
|
||||
|
||||
@@ -194,7 +200,7 @@ OBJECTS = $(wxcopy_OBJECTS) $(wxpaste_OBJECTS) $(wdwrite_OBJECTS) $(getstyle_OBJ
|
||||
all: Makefile $(PROGRAMS) $(SCRIPTS)
|
||||
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .S .c .o .s
|
||||
.SUFFIXES: .S .c .lo .o .s
|
||||
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnu util/Makefile
|
||||
|
||||
@@ -217,8 +223,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
|
||||
$(mkinstalldirs) $(DESTDIR)$(bindir)
|
||||
@list='$(bin_PROGRAMS)'; for p in $$list; do \
|
||||
if test -f $$p; then \
|
||||
echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
|
||||
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
|
||||
echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
|
||||
$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
|
||||
else :; fi; \
|
||||
done
|
||||
|
||||
@@ -247,6 +253,25 @@ distclean-compile:
|
||||
|
||||
maintainer-clean-compile:
|
||||
|
||||
.c.lo:
|
||||
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
|
||||
|
||||
.s.lo:
|
||||
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
|
||||
|
||||
.S.lo:
|
||||
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
|
||||
|
||||
mostlyclean-libtool:
|
||||
-rm -f *.lo
|
||||
|
||||
clean-libtool:
|
||||
-rm -rf .libs _libs
|
||||
|
||||
distclean-libtool:
|
||||
|
||||
maintainer-clean-libtool:
|
||||
|
||||
wxcopy: $(wxcopy_OBJECTS) $(wxcopy_DEPENDENCIES)
|
||||
@rm -f wxcopy
|
||||
$(LINK) $(wxcopy_LDFLAGS) $(wxcopy_OBJECTS) $(wxcopy_LDADD) $(LIBS)
|
||||
@@ -371,30 +396,33 @@ maintainer-clean-generic:
|
||||
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
|
||||
mostlyclean: mostlyclean-binPROGRAMS mostlyclean-compile \
|
||||
mostlyclean-tags mostlyclean-generic
|
||||
mostlyclean-libtool mostlyclean-tags \
|
||||
mostlyclean-generic
|
||||
|
||||
clean: clean-binPROGRAMS clean-compile clean-tags clean-generic \
|
||||
mostlyclean
|
||||
clean: clean-binPROGRAMS clean-compile clean-libtool clean-tags \
|
||||
clean-generic mostlyclean
|
||||
|
||||
distclean: distclean-binPROGRAMS distclean-compile distclean-tags \
|
||||
distclean-generic clean
|
||||
distclean: distclean-binPROGRAMS distclean-compile distclean-libtool \
|
||||
distclean-tags distclean-generic clean
|
||||
-rm -f config.status
|
||||
-rm -f libtool
|
||||
|
||||
maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \
|
||||
maintainer-clean-tags maintainer-clean-generic \
|
||||
distclean
|
||||
maintainer-clean-libtool maintainer-clean-tags \
|
||||
maintainer-clean-generic distclean
|
||||
@echo "This command is intended for maintainers to use;"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
|
||||
.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
|
||||
maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
|
||||
mostlyclean-compile distclean-compile clean-compile \
|
||||
maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS tags \
|
||||
mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
|
||||
distdir info dvi installcheck install-exec install-data install \
|
||||
uninstall all installdirs mostlyclean-generic distclean-generic \
|
||||
clean-generic maintainer-clean-generic clean mostlyclean distclean \
|
||||
maintainer-clean
|
||||
maintainer-clean-compile mostlyclean-libtool distclean-libtool \
|
||||
clean-libtool maintainer-clean-libtool uninstall-binSCRIPTS \
|
||||
install-binSCRIPTS tags mostlyclean-tags distclean-tags clean-tags \
|
||||
maintainer-clean-tags distdir info dvi installcheck install-exec \
|
||||
install-data install uninstall all installdirs mostlyclean-generic \
|
||||
distclean-generic clean-generic maintainer-clean-generic clean \
|
||||
mostlyclean distclean maintainer-clean
|
||||
|
||||
|
||||
wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile
|
||||
@@ -402,6 +430,7 @@ wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile
|
||||
sed -e "s:#pkgdatadir#:$(pkgdatadir):" \
|
||||
-e "s/#version#/$(VERSION)/" \
|
||||
-e "s:#bindir#:$(bindir):" \
|
||||
-e "s:#LITE#:@LITE@:" \
|
||||
$(srcdir)/wmaker.inst.in >wmaker.inst
|
||||
|
||||
chmod 755 wmaker.inst
|
||||
|
||||
Reference in New Issue
Block a user