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.
---
Makefile.am | 6 ++-
WINGs/Documentation/Makefile.am | 2 +-
WINGs/Makefile.am | 3 +-
WPrefs.app/tiff/Makefile.am | 3 +
WPrefs.app/xpm/Makefile.am | 2 +
WindowMaker/Icons/Makefile.am | 84 +++++++++++++++++++++------------------
WindowMaker/Makefile.am | 13 ++----
configure.ac | 2 +-
doc/Makefile.am | 2 +-
po/Makefile.am | 4 +-
src/Makefile.am | 2 +
util/Makefile.am | 2 +
wrlib/Makefile.am | 3 +
13 files changed, 72 insertions(+), 56 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a0985d5..8f7b6b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,8 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = wrlib WINGs src util po WindowMaker WPrefs.app doc
EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N FAQ.I18N.cs FAQ.I18N.sk \
- INSTALL.cs INSTALL.fr INSTALL.es INSTALL.pt INSTALL.sk \
- README.definable-cursor README.pt COPYING.WTFPL
+ INSTALL-WMAKER INSTALL-WMAKER.cs INSTALL-WMAKER.fr INSTALL-WMAKER.es \
+ INSTALL-WMAKER.pt INSTALL-WMAKER.sk README.definable-cursor \
+ The-perfect-Window-Maker-patch.txt \
+ README.es README.pt COPYING.WTFPL autogen.sh
diff --git a/WINGs/Documentation/Makefile.am b/WINGs/Documentation/Makefile.am
index 29f9b52..78cd1e3 100644
--- a/WINGs/Documentation/Makefile.am
+++ b/WINGs/Documentation/Makefile.am
@@ -2,5 +2,5 @@
AUTOMAKE_OPTIONS = no-dependencies
-EXTRA_DIST = README.connection
+EXTRA_DIST =
diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am
index 4db12fe..b60683c 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -21,7 +21,7 @@ lib_LTLIBRARIES = libWINGs.la libWUtil.la
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
@@ -30,6 +30,7 @@ libWINGs_la_SOURCES = \
dragcommon.c \
dragdestination.c \
dragsource.c \
+ rgb.h \
selection.c \
wappresource.c \
wballoon.c \
diff --git a/WPrefs.app/tiff/Makefile.am b/WPrefs.app/tiff/Makefile.am
index 3e57d3b..f4bbbd1 100644
--- a/WPrefs.app/tiff/Makefile.am
+++ b/WPrefs.app/tiff/Makefile.am
@@ -20,6 +20,7 @@ EXTRA_DIST = \
menualign2.tiff \
menuprefs.tiff \
menus.tiff \
+ miscprefs2.tiff \
moreanim.tiff \
mousesettings.tiff \
mousespeed.tiff \
@@ -32,6 +33,7 @@ EXTRA_DIST = \
opaque.tiff \
paths.tiff \
smooth.tiff \
+ sound.tiff \
speed0.tiff \
speed0s.tiff \
speed1.tiff \
@@ -44,6 +46,7 @@ EXTRA_DIST = \
speed4s.tiff \
tdel.tiff \
tedit.tiff \
+ temp.tiff \
textr.tiff \
theme.tiff \
timer0.tiff \
diff --git a/WPrefs.app/xpm/Makefile.am b/WPrefs.app/xpm/Makefile.am
index 233a00b..5245e94 100644
--- a/WPrefs.app/xpm/Makefile.am
+++ b/WPrefs.app/xpm/Makefile.am
@@ -33,6 +33,7 @@ EXTRA_DIST = \
opaque.xpm \
paths.xpm \
smooth.xpm \
+ sound.xpm \
speed0.xpm \
speed0s.xpm \
speed1.xpm \
@@ -45,6 +46,7 @@ EXTRA_DIST = \
speed4s.xpm \
tdel.xpm \
tedit.xpm \
+ temp.xpm \
textr.xpm \
theme.xpm \
timer0.xpm \
diff --git a/WindowMaker/Icons/Makefile.am b/WindowMaker/Icons/Makefile.am
index 82fa3d6..b1df351 100644
--- a/WindowMaker/Icons/Makefile.am
+++ b/WindowMaker/Icons/Makefile.am
@@ -4,67 +4,73 @@ defsdatadir = $(pkgdatadir)/Icons
defsdata_DATA = \
BitchX.tiff\
+ BitchX.xpm\
+ clip.tiff\
+ clip.xpm\
+ defaultAppIcon.tiff\
DefaultAppIcon.tiff\
+ defaultAppIcon.xpm\
+ defaultterm.tiff\
+ defaultterm.xpm\
+ draw.tiff\
+ draw.xpm\
+ Ear.png\
Ftp.png\
- GNUstep.tiff\
GNUstep3D.tiff\
+ GNUstep3D.xpm\
GNUstepGlow.tiff\
+ GNUstepGlow.xpm\
+ GNUstep.tiff\
+ GNUstep.xpm\
GNUterm.tiff\
+ GNUterm.xpm\
GreenWilber.png\
ICQ.png\
Jabber.png\
- Mozilla.png\
- Netscape.png\
- Pen.png\
- Pencil.png\
- Real.png\
- Shell.png\
- Speaker.png\
- Terminal.tiff\
- TerminalGNUstep.tiff\
- TerminalLinux.tiff\
- XChat.png\
- clip.tiff\
- defaultAppIcon.tiff\
- defaultterm.tiff\
- draw.tiff\
linuxterm.tiff\
+ linuxterm.xpm\
+ Magnify.tiff\
+ Magnify.xpm\
mixer.tiff\
+ mixer.xpm\
+ Mouth.png\
+ Mozilla.png\
+ Netscape.png\
notepad.tiff\
+ notepad.xpm\
pdf.tiff\
+ pdf.xpm\
+ Pencil.png\
+ Pen.png\
ps.tiff\
+ ps.xpm\
+ README\
+ Real.png\
real.tiff\
+ real.xpm\
sgiterm.tiff\
+ sgiterm.xpm\
+ Shell.png\
+ Speaker.png\
staroffice2.tiff\
- timer.tiff\
- wilber.tiff\
- write.tiff\
- xdvi.tiff\
- xv.tiff\
- BitchX.xpm\
- GNUstep.xpm\
- GNUstep3D.xpm\
- GNUstepGlow.xpm\
- GNUterm.xpm\
- Terminal.xpm\
+ staroffice2.xpm\
+ TerminalGNUstep.tiff\
TerminalGNUstep.xpm\
+ TerminalLinux.tiff\
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\
+ Terminal.tiff\
+ Terminal.xpm\
+ timer.tiff\
timer.xpm\
+ wilber.tiff\
wilber.xpm\
+ Wine.png\
+ write.tiff\
write.xpm\
+ XChat.png\
+ xdvi.tiff\
xdvi.xpm\
+ xv.tiff\
xv.xpm
diff --git a/WindowMaker/Makefile.am b/WindowMaker/Makefile.am
index ef4790b..a30fb00 100644
--- a/WindowMaker/Makefile.am
+++ b/WindowMaker/Makefile.am
@@ -3,9 +3,9 @@ SUBDIRS = Backgrounds Defaults IconSets Icons Pixmaps Styles
Themes
prefsdatadir = $(pkgdatadir)
prefsdata_DATA =\
- README\
- README.themes\
+ appearance.menu\
autostart.sh\
+ background.menu\
exitscript.sh\
menu\
menu.bg\
@@ -52,15 +52,10 @@ prefsdata_DATA =\
plmenu.sk\
plmenu.zh_CN\
plmenu.zh_TW\
+ README\
+ README.themes\
wmmacros
EXTRA_DIST = $(prefsdata_DATA) mkMakefile
-.c.o:
- $(QUIET)$(COMPILE) -c $<
-
-.c.obj:
- $(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-.c.lo:
- $(QUIET)$(LTCOMPILE) -c -o $@ $<
diff --git a/configure.ac b/configure.ac
index 7d24c98..9f74418 100644
--- a/configure.ac
+++ b/configure.ac
@@ -862,7 +862,7 @@ AC_OUTPUT(Makefile po/Makefile util/Makefile
util/po/Makefile \
WINGs/Extras/Makefile WINGs/po/Makefile \
wrlib/Makefile wrlib/tests/Makefile \
src/Makefile src/wconfig.h \
- doc/Makefile doc/sk/Makefile \
+ doc/Makefile doc/sk/Makefile doc/cs/Makefile \
WindowMaker/Makefile WindowMaker/Backgrounds/Makefile \
WindowMaker/Defaults/Makefile WindowMaker/IconSets/Makefile \
WindowMaker/Icons/Makefile WindowMaker/Pixmaps/Makefile \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index acab6de..7561972 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = sk
+SUBDIRS = sk cs
man_MANS = \
geticonset.1x \
diff --git a/po/Makefile.am b/po/Makefile.am
index a97537c..dd378f2 100644
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -6,8 +6,8 @@ CLEANFILES = $(CATALOGS) WindowMaker.pot
# 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 \
- fi.po fr.po gl.po hr.po hu.po it.po ja.po ko.po ms.po nl.po no.po \
- pl.po pt.po ro.po ru.po sk.po sv.po tr.po zh_CN.po zh_TW.po
+ fi.po fr.po gl.po hr.po hu.po hy.po it.po ja.po ko.po ms.po nl.po \
+ no.po pl.po pt.po ro.po ru.po sk.po sv.po tr.po zh_CN.po zh_TW.po
POTFILES = \
$(top_builddir)/src/appicon.c \
diff --git a/src/Makefile.am b/src/Makefile.am
index cfd04cd..4de9169 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,6 +58,7 @@ wmaker_SOURCES = \
resources.c \
resources.h \
rootmenu.c \
+ rootmenu.h \
screen.c \
screen.h \
session.h \
@@ -100,6 +101,7 @@ wmaker_SOURCES = \
text.c \
text.h
+EXTRA_wmaker_SOURCES = osdep_bsd.c osdep_darwin.c osdep_linux.c osdep_stub.c
AM_CPPFLAGS = $(DFLAGS) -DLOCALEDIR=\"$(NLSDIR)\"
diff --git a/util/Makefile.am b/util/Makefile.am
index ba4c8db..2b861d6 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -61,6 +61,8 @@ wmgenmenu_LDADD = \
$(top_builddir)/WINGs/libWUtil.la \
@INTLIBS@
+wmgenmenu_SOURCES = wmgenmenu.c wmgenmenu.h
+
CLEANFILES = wmaker.inst
wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile
diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am
index 78551cc..7d0dcac 100644
--- a/wrlib/Makefile.am
+++ b/wrlib/Makefile.am
@@ -4,6 +4,8 @@ SUBDIRS = .
AUTOMAKE_OPTIONS = no-dependencies
+EXTRA_DIST = tests
+
lib_LTLIBRARIES = libwraster.la
libwraster_la_LDFLAGS = -version-info 4:0:1
@@ -22,6 +24,7 @@ libwraster_la_SOURCES = \
save.c \
gradient.c \
xpixmap.c \
+ bench.h \
convert.c \
x86_specific.c \
context.c \
--
1.7.0.4
--
To unsubscribe, send mail to [email protected].
