Revision: 40948
http://brlcad.svn.sourceforge.net/brlcad/?rev=40948&view=rev
Author: brlcad
Date: 2010-10-08 15:06:47 +0000 (Fri, 08 Oct 2010)
Log Message:
-----------
derecursify the archlinux, debian, nsis, and win32-msvc directories since they
are purely extra_dist content. unroll them up into misc/'s makefile.
Modified Paths:
--------------
brlcad/trunk/configure.ac
brlcad/trunk/misc/Makefile.am
Removed Paths:
-------------
brlcad/trunk/misc/debian/Makefile.am
brlcad/trunk/misc/nsis/Makefile.am
brlcad/trunk/misc/win32-msvc/Makefile.am
Modified: brlcad/trunk/configure.ac
===================================================================
--- brlcad/trunk/configure.ac 2010-10-08 10:56:46 UTC (rev 40947)
+++ brlcad/trunk/configure.ac 2010-10-08 15:06:47 UTC (rev 40948)
@@ -4208,15 +4208,12 @@
include/conf/Makefile
m4/Makefile
misc/Makefile
- misc/archlinux/Makefile
misc/brlcad-config
misc/brlcad.spec
- misc/debian/Makefile
misc/macosx/Makefile
misc/macosx/Resources/Makefile
misc/macosx/Resources/ReadMe.rtfd/Makefile
misc/macosx/Resources/Welcome.rtfd/Makefile
- misc/nsis/Makefile
misc/pkgconfig/Makefile
misc/pkgconfig/libanalyze.pc
misc/pkgconfig/libbn.pc
@@ -4234,8 +4231,6 @@
misc/pkgconfig/libpkg.pc
misc/pkgconfig/librt.pc
misc/pkgconfig/libwdb.pc
- misc/win32-msvc/Dll/Makefile
- misc/win32-msvc/Makefile
misc/win32-msvc8/Makefile
pix/Makefile
sh/Makefile
Modified: brlcad/trunk/misc/Makefile.am
===================================================================
--- brlcad/trunk/misc/Makefile.am 2010-10-08 10:56:46 UTC (rev 40947)
+++ brlcad/trunk/misc/Makefile.am 2010-10-08 15:06:47 UTC (rev 40948)
@@ -1,12 +1,8 @@
SUBDIRS = \
- archlinux \
- debian \
enigma \
macosx \
- nsis \
pkgconfig \
- win32-msvc \
win32-msvc8
sample_applicationsdir = $(SAMPLE_APPLICATIONS_DIR)
@@ -20,21 +16,51 @@
NIST_DENSITIES
EXTRA_DIST = \
- ${DATAFILES} \
$(man_MANS) \
$(sample_applications_DATA) \
+ ${DATAFILES} \
Description.txt \
Doxyfile \
Makefile.defs \
+ archlinux/PKGBUILD \
+ archlinux/brlcad.install \
+ archlinux/brlcad.sh \
batch-indent-region.el \
brlcad-config \
brlcad-config.in \
brlcad.spec \
brlcad.spec.in \
+ debian/brlcad-bin.docs \
+ debian/brlcad-bin.install \
+ debian/brlcad-bin.lintian-overrides \
+ debian/brlcad-data.install \
+ debian/brlcad-dev.install \
+ debian/brlcad-doc.install \
+ debian/changelog \
+ debian/compat \
+ debian/control \
+ debian/copyright \
+ debian/rules \
+ debian/source/format \
+ debian/watch
doxygen_structure \
flawfinder \
- libtool.m4
+ libtool.m4 \
+ nsis/brlcad.ico \
+ nsis/brlcad.nsi \
+ nsis/header.bmp \
+ nsis/side.bmp \
+ nsis/uninstall.ico \
+ nsis/updateVersion.tcl \
+ win32-msvc/CMakeLists.txt \
+ win32-msvc/Dll/BrlcadCore.def \
+ win32-msvc/Dll/BrlcadCore.rc \
+ win32-msvc/Dll/CMakeLists.txt \
+ win32-msvc/Dll/brlcad.def \
+ win32-msvc/Dll/brlcad.rc \
+ win32-msvc/Dll/TclDummies.c
+
datafilesdir = $(BRLCAD_DATA)/data
datafiles_DATA = \
Deleted: brlcad/trunk/misc/debian/Makefile.am
===================================================================
--- brlcad/trunk/misc/debian/Makefile.am 2010-10-08 10:56:46 UTC (rev
40947)
+++ brlcad/trunk/misc/debian/Makefile.am 2010-10-08 15:06:47 UTC (rev
40948)
@@ -1,17 +0,0 @@
-
-EXTRA_DIST = \
- brlcad-bin.docs \
- brlcad-bin.install \
- brlcad-bin.lintian-overrides \
- brlcad-data.install \
- brlcad-dev.install \
- brlcad-doc.install \
- changelog \
- compat \
- control \
- copyright \
- rules \
- source/format \
- watch
-
-include $(top_srcdir)/misc/Makefile.defs
Deleted: brlcad/trunk/misc/nsis/Makefile.am
===================================================================
--- brlcad/trunk/misc/nsis/Makefile.am 2010-10-08 10:56:46 UTC (rev 40947)
+++ brlcad/trunk/misc/nsis/Makefile.am 2010-10-08 15:06:47 UTC (rev 40948)
@@ -1,10 +0,0 @@
-
-EXTRA_DIST = \
- brlcad.ico \
- brlcad.nsi \
- header.bmp \
- side.bmp \
- uninstall.ico \
- updateVersion.tcl
-
-include $(top_srcdir)/misc/Makefile.defs
Deleted: brlcad/trunk/misc/win32-msvc/Makefile.am
===================================================================
--- brlcad/trunk/misc/win32-msvc/Makefile.am 2010-10-08 10:56:46 UTC (rev
40947)
+++ brlcad/trunk/misc/win32-msvc/Makefile.am 2010-10-08 15:06:47 UTC (rev
40948)
@@ -1,8 +0,0 @@
-
-SUBDIRS = \
- Dll
-
-EXTRA_DIST = \
- CMakeLists.txt
-
-include $(top_srcdir)/misc/Makefile.defs
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
