1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-28 09:22:27 +01:00

Fix "make dist"

The "make dist" command can be used to generate the release tarball, but
only if the Makefile.am correctly specifies EXTRA_DIST, specifies
headers in foo_SOURCES, and so on.
This commit is contained in:
Brad Jorsch
2010-04-09 10:40:51 -04:00
committed by Carlos R. Mafra
parent 39426bde35
commit bbe55ba242
13 changed files with 74 additions and 58 deletions

View File

@@ -5,6 +5,8 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = wrlib WINGs src util po WindowMaker WPrefs.app doc SUBDIRS = wrlib WINGs src util po WindowMaker WPrefs.app doc
EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N FAQ.I18N.cs FAQ.I18N.sk \ EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N FAQ.I18N.cs FAQ.I18N.sk \
INSTALL.cs INSTALL.fr INSTALL.es INSTALL.pt INSTALL.sk \ INSTALL-WMAKER INSTALL-WMAKER.cs INSTALL-WMAKER.fr INSTALL-WMAKER.es \
README.definable-cursor README.pt COPYING.WTFPL INSTALL-WMAKER.pt INSTALL-WMAKER.sk README.definable-cursor \
The-perfect-Window-Maker-patch.txt \
README.es README.pt COPYING.WTFPL autogen.sh

View File

@@ -2,5 +2,5 @@
AUTOMAKE_OPTIONS = no-dependencies AUTOMAKE_OPTIONS = no-dependencies
EXTRA_DIST = README.connection EXTRA_DIST =

View File

@@ -21,7 +21,7 @@ lib_LTLIBRARIES = libWINGs.la libWUtil.la
LDADD= libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@ LDADD= libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
EXTRA_DIST = BUGS make-rgb EXTRA_DIST = BUGS make-rgb Examples Extras Tests
# wbutton.c # wbutton.c
@@ -30,6 +30,7 @@ libWINGs_la_SOURCES = \
dragcommon.c \ dragcommon.c \
dragdestination.c \ dragdestination.c \
dragsource.c \ dragsource.c \
rgb.h \
selection.c \ selection.c \
wappresource.c \ wappresource.c \
wballoon.c \ wballoon.c \

View File

@@ -20,6 +20,7 @@ EXTRA_DIST = \
menualign2.tiff \ menualign2.tiff \
menuprefs.tiff \ menuprefs.tiff \
menus.tiff \ menus.tiff \
miscprefs2.tiff \
moreanim.tiff \ moreanim.tiff \
mousesettings.tiff \ mousesettings.tiff \
mousespeed.tiff \ mousespeed.tiff \
@@ -32,6 +33,7 @@ EXTRA_DIST = \
opaque.tiff \ opaque.tiff \
paths.tiff \ paths.tiff \
smooth.tiff \ smooth.tiff \
sound.tiff \
speed0.tiff \ speed0.tiff \
speed0s.tiff \ speed0s.tiff \
speed1.tiff \ speed1.tiff \
@@ -44,6 +46,7 @@ EXTRA_DIST = \
speed4s.tiff \ speed4s.tiff \
tdel.tiff \ tdel.tiff \
tedit.tiff \ tedit.tiff \
temp.tiff \
textr.tiff \ textr.tiff \
theme.tiff \ theme.tiff \
timer0.tiff \ timer0.tiff \

View File

@@ -33,6 +33,7 @@ EXTRA_DIST = \
opaque.xpm \ opaque.xpm \
paths.xpm \ paths.xpm \
smooth.xpm \ smooth.xpm \
sound.xpm \
speed0.xpm \ speed0.xpm \
speed0s.xpm \ speed0s.xpm \
speed1.xpm \ speed1.xpm \
@@ -45,6 +46,7 @@ EXTRA_DIST = \
speed4s.xpm \ speed4s.xpm \
tdel.xpm \ tdel.xpm \
tedit.xpm \ tedit.xpm \
temp.xpm \
textr.xpm \ textr.xpm \
theme.xpm \ theme.xpm \
timer0.xpm \ timer0.xpm \

View File

@@ -4,67 +4,73 @@ defsdatadir = $(pkgdatadir)/Icons
defsdata_DATA = \ defsdata_DATA = \
BitchX.tiff\ BitchX.tiff\
BitchX.xpm\
clip.tiff\
clip.xpm\
defaultAppIcon.tiff\
DefaultAppIcon.tiff\ DefaultAppIcon.tiff\
defaultAppIcon.xpm\
defaultterm.tiff\
defaultterm.xpm\
draw.tiff\
draw.xpm\
Ear.png\
Ftp.png\ Ftp.png\
GNUstep.tiff\
GNUstep3D.tiff\ GNUstep3D.tiff\
GNUstep3D.xpm\
GNUstepGlow.tiff\ GNUstepGlow.tiff\
GNUstepGlow.xpm\
GNUstep.tiff\
GNUstep.xpm\
GNUterm.tiff\ GNUterm.tiff\
GNUterm.xpm\
GreenWilber.png\ GreenWilber.png\
ICQ.png\ ICQ.png\
Jabber.png\ Jabber.png\
linuxterm.tiff\
linuxterm.xpm\
Magnify.tiff\
Magnify.xpm\
mixer.tiff\
mixer.xpm\
Mouth.png\
Mozilla.png\ Mozilla.png\
Netscape.png\ Netscape.png\
Pen.png\ notepad.tiff\
notepad.xpm\
pdf.tiff\
pdf.xpm\
Pencil.png\ Pencil.png\
Pen.png\
ps.tiff\
ps.xpm\
README\
Real.png\ Real.png\
real.tiff\
real.xpm\
sgiterm.tiff\
sgiterm.xpm\
Shell.png\ Shell.png\
Speaker.png\ Speaker.png\
Terminal.tiff\
TerminalGNUstep.tiff\
TerminalLinux.tiff\
XChat.png\
clip.tiff\
defaultAppIcon.tiff\
defaultterm.tiff\
draw.tiff\
linuxterm.tiff\
mixer.tiff\
notepad.tiff\
pdf.tiff\
ps.tiff\
real.tiff\
sgiterm.tiff\
staroffice2.tiff\ staroffice2.tiff\
timer.tiff\
wilber.tiff\
write.tiff\
xdvi.tiff\
xv.tiff\
BitchX.xpm\
GNUstep.xpm\
GNUstep3D.xpm\
GNUstepGlow.xpm\
GNUterm.xpm\
Terminal.xpm\
TerminalGNUstep.xpm\
TerminalLinux.xpm\
clip.xpm\
defaultAppIcon.xpm\
defaultterm.xpm\
draw.xpm\
linuxterm.xpm\
mixer.xpm\
notepad.xpm\
pdf.xpm\
ps.xpm\
real.xpm\
sgiterm.xpm\
staroffice2.xpm\ staroffice2.xpm\
TerminalGNUstep.tiff\
TerminalGNUstep.xpm\
TerminalLinux.tiff\
TerminalLinux.xpm\
Terminal.tiff\
Terminal.xpm\
timer.tiff\
timer.xpm\ timer.xpm\
wilber.tiff\
wilber.xpm\ wilber.xpm\
Wine.png\
write.tiff\
write.xpm\ write.xpm\
XChat.png\
xdvi.tiff\
xdvi.xpm\ xdvi.xpm\
xv.tiff\
xv.xpm xv.xpm

View File

@@ -3,9 +3,9 @@ SUBDIRS = Backgrounds Defaults IconSets Icons Pixmaps Styles Themes
prefsdatadir = $(pkgdatadir) prefsdatadir = $(pkgdatadir)
prefsdata_DATA =\ prefsdata_DATA =\
README\ appearance.menu\
README.themes\
autostart.sh\ autostart.sh\
background.menu\
exitscript.sh\ exitscript.sh\
menu\ menu\
menu.bg\ menu.bg\
@@ -52,15 +52,10 @@ prefsdata_DATA =\
plmenu.sk\ plmenu.sk\
plmenu.zh_CN\ plmenu.zh_CN\
plmenu.zh_TW\ plmenu.zh_TW\
README\
README.themes\
wmmacros wmmacros
EXTRA_DIST = $(prefsdata_DATA) mkMakefile EXTRA_DIST = $(prefsdata_DATA) mkMakefile
.c.o:
$(QUIET)$(COMPILE) -c $<
.c.obj:
$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
$(QUIET)$(LTCOMPILE) -c -o $@ $<

View File

@@ -862,7 +862,7 @@ AC_OUTPUT(Makefile po/Makefile util/Makefile util/po/Makefile \
WINGs/Extras/Makefile WINGs/po/Makefile \ WINGs/Extras/Makefile WINGs/po/Makefile \
wrlib/Makefile wrlib/tests/Makefile \ wrlib/Makefile wrlib/tests/Makefile \
src/Makefile src/wconfig.h \ src/Makefile src/wconfig.h \
doc/Makefile doc/sk/Makefile \ doc/Makefile doc/sk/Makefile doc/cs/Makefile \
WindowMaker/Makefile WindowMaker/Backgrounds/Makefile \ WindowMaker/Makefile WindowMaker/Backgrounds/Makefile \
WindowMaker/Defaults/Makefile WindowMaker/IconSets/Makefile \ WindowMaker/Defaults/Makefile WindowMaker/IconSets/Makefile \
WindowMaker/Icons/Makefile WindowMaker/Pixmaps/Makefile \ WindowMaker/Icons/Makefile WindowMaker/Pixmaps/Makefile \

View File

@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
SUBDIRS = sk SUBDIRS = sk cs
man_MANS = \ man_MANS = \
geticonset.1x \ geticonset.1x \

View File

@@ -6,8 +6,8 @@ CLEANFILES = $(CATALOGS) WindowMaker.pot
# Please keep this sorted in alphabetic order! # Please keep this sorted in alphabetic order!
EXTRA_DIST = be.po bg.po bs.po ca.po cs.po da.po de.po el.po es.po et.po \ EXTRA_DIST = be.po bg.po bs.po ca.po cs.po da.po de.po el.po es.po et.po \
fi.po fr.po gl.po hr.po hu.po it.po ja.po ko.po ms.po nl.po no.po \ fi.po fr.po gl.po hr.po hu.po hy.po it.po ja.po ko.po ms.po nl.po \
pl.po pt.po ro.po ru.po sk.po sv.po tr.po zh_CN.po zh_TW.po no.po pl.po pt.po ro.po ru.po sk.po sv.po tr.po zh_CN.po zh_TW.po
POTFILES = \ POTFILES = \
$(top_builddir)/src/appicon.c \ $(top_builddir)/src/appicon.c \

View File

@@ -58,6 +58,7 @@ wmaker_SOURCES = \
resources.c \ resources.c \
resources.h \ resources.h \
rootmenu.c \ rootmenu.c \
rootmenu.h \
screen.c \ screen.c \
screen.h \ screen.h \
session.h \ session.h \
@@ -100,6 +101,7 @@ wmaker_SOURCES = \
text.c \ text.c \
text.h text.h
EXTRA_wmaker_SOURCES = osdep_bsd.c osdep_darwin.c osdep_linux.c osdep_stub.c
AM_CPPFLAGS = $(DFLAGS) -DLOCALEDIR=\"$(NLSDIR)\" AM_CPPFLAGS = $(DFLAGS) -DLOCALEDIR=\"$(NLSDIR)\"

View File

@@ -61,6 +61,8 @@ wmgenmenu_LDADD = \
$(top_builddir)/WINGs/libWUtil.la \ $(top_builddir)/WINGs/libWUtil.la \
@INTLIBS@ @INTLIBS@
wmgenmenu_SOURCES = wmgenmenu.c wmgenmenu.h
CLEANFILES = wmaker.inst CLEANFILES = wmaker.inst
wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile

View File

@@ -4,6 +4,8 @@ SUBDIRS = .
AUTOMAKE_OPTIONS = no-dependencies AUTOMAKE_OPTIONS = no-dependencies
EXTRA_DIST = tests
lib_LTLIBRARIES = libwraster.la lib_LTLIBRARIES = libwraster.la
libwraster_la_LDFLAGS = -version-info 4:0:1 libwraster_la_LDFLAGS = -version-info 4:0:1
@@ -22,6 +24,7 @@ libwraster_la_SOURCES = \
save.c \ save.c \
gradient.c \ gradient.c \
xpixmap.c \ xpixmap.c \
bench.h \
convert.c \ convert.c \
x86_specific.c \ x86_specific.c \
context.c \ context.c \