Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[4727] trunk/OpenMPT
|
From: <man...@us...> - 2015-01-22 11:49:19
|
Revision: 4727
http://sourceforge.net/p/modplug/code/4727
Author: manxorist
Date: 2015-01-22 11:49:05 +0000 (Thu, 22 Jan 2015)
Log Message:
-----------
[Var] build: Rename libopenmpt/examples/ to examples/ in order to make 'make install' consistent between simple makefile and autotools tarballs. Automake does not support an easy way to influence the install path (it can do either with full path or no path at all). Two other possible solutions would have been to write a custom install rule (which results in all the portability stuff to be handled on our site instead of having automake do it's work) or use recursive automake (which would open another whole can of worms on its own). Just renaming the folder is the most simple solution with the least risk of more maintanance work in the future. (fixes https://bugs.openmpt.org/view.php?id=624)
Modified Paths:
--------------
trunk/OpenMPT/Makefile
trunk/OpenMPT/build/autotools/Makefile.am
trunk/OpenMPT/build/autotools/autoconfiscate.sh
trunk/OpenMPT/build/svn/run_clang-format.sh
trunk/OpenMPT/build/vs2008/libopenmpt_example_c/libopenmpt_example_c.vcproj
trunk/OpenMPT/libopenmpt/Doxyfile
Added Paths:
-----------
trunk/OpenMPT/examples/
Removed Paths:
-------------
trunk/OpenMPT/libopenmpt/examples/
Modified: trunk/OpenMPT/Makefile
===================================================================
--- trunk/OpenMPT/Makefile 2015-01-21 18:56:51 UTC (rev 4726)
+++ trunk/OpenMPT/Makefile 2015-01-22 11:49:05 UTC (rev 4727)
@@ -494,8 +494,8 @@
ALL_DEPENDS += $(LIBOPENMPTTEST_DEPENDS)
-EXAMPLES_CXX_SOURCES += $(wildcard libopenmpt/examples/*.cpp)
-EXAMPLES_C_SOURCES += $(wildcard libopenmpt/examples/*.c)
+EXAMPLES_CXX_SOURCES += $(wildcard examples/*.cpp)
+EXAMPLES_C_SOURCES += $(wildcard examples/*.c)
EXAMPLES_OBJECTS += $(EXAMPLES_CXX_SOURCES:.cpp=.o)
EXAMPLES_OBJECTS += $(EXAMPLES_C_SOURCES:.c=.o)
@@ -668,10 +668,10 @@
$(INSTALL_DATA) README.md $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/README.md
$(INSTALL_DATA) TODO $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/TODO
$(INSTALL_MAKE_DIR) $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/examples
- $(INSTALL_DATA) libopenmpt/examples/libopenmpt_example_c.c $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/examples/libopenmpt_example_c.c
- $(INSTALL_DATA) libopenmpt/examples/libopenmpt_example_c_mem.c $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/examples/libopenmpt_example_c_mem.c
- $(INSTALL_DATA) libopenmpt/examples/libopenmpt_example_c_stdout.c $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/examples/libopenmpt_example_c_stdout.c
- $(INSTALL_DATA) libopenmpt/examples/libopenmpt_example_cxx.cpp $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/examples/libopenmpt_example_cxx.cpp
+ $(INSTALL_DATA) examples/libopenmpt_example_c.c $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/examples/libopenmpt_example_c.c
+ $(INSTALL_DATA) examples/libopenmpt_example_c_mem.c $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/examples/libopenmpt_example_c_mem.c
+ $(INSTALL_DATA) examples/libopenmpt_example_c_stdout.c $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/examples/libopenmpt_example_c_stdout.c
+ $(INSTALL_DATA) examples/libopenmpt_example_cxx.cpp $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/examples/libopenmpt_example_cxx.cpp
.PHONY: install-doc
install-doc: bin/made.docs
@@ -770,6 +770,7 @@
svn export ./soundlib bin/dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/soundlib
svn export ./test bin/dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/test
svn export ./libopenmpt bin/dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/libopenmpt
+ svn export ./examples bin/dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/examples
svn export ./openmpt123 bin/dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/openmpt123
svn export ./include/miniz bin/dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/miniz
svn export ./include/modplug bin/dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/modplug
@@ -793,6 +794,7 @@
svn export ./soundlib bin/dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/soundlib --native-eol CRLF
svn export ./test bin/dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/test --native-eol CRLF
svn export ./libopenmpt bin/dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/libopenmpt --native-eol CRLF
+ svn export ./examples bin/dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/examples --native-eol CRLF
svn export ./openmpt123 bin/dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/openmpt123 --native-eol CRLF
svn export ./include/miniz bin/dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/miniz --native-eol CRLF
svn export ./include/flac bin/dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/flac --native-eol CRLF
@@ -848,53 +850,53 @@
$(SILENT)$(LINK.cc) $(LDFLAGS_RPATH) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_OPENMPT123) $(OPENMPT123_OBJECTS) $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_OPENMPT123) -o $@
endif
-libopenmpt/examples/libopenmpt_example_c.o: libopenmpt/examples/libopenmpt_example_c.c
+examples/libopenmpt_example_c.o: examples/libopenmpt_example_c.c
$(INFO) [CC] $<
$(VERYSILENT)$(CC) $(CFLAGS) $(CFLAGS_PORTAUDIO) $(CPPFLAGS) $(CPPFLAGS_PORTAUDIO) $(TARGET_ARCH) -M -MT$@ $< > $*.d
$(SILENT)$(COMPILE.c) $(CFLAGS_PORTAUDIO) $(CPPFLAGS_PORTAUDIO) $(OUTPUT_OPTION) $<
-libopenmpt/examples/libopenmpt_example_c_mem.o: libopenmpt/examples/libopenmpt_example_c_mem.c
+examples/libopenmpt_example_c_mem.o: examples/libopenmpt_example_c_mem.c
$(INFO) [CC] $<
$(VERYSILENT)$(CC) $(CFLAGS) $(CFLAGS_PORTAUDIO) $(CPPFLAGS) $(CPPFLAGS_PORTAUDIO) $(TARGET_ARCH) -M -MT$@ $< > $*.d
$(SILENT)$(COMPILE.c) $(CFLAGS_PORTAUDIO) $(CPPFLAGS_PORTAUDIO) $(OUTPUT_OPTION) $<
-libopenmpt/examples/libopenmpt_example_c_stdout.o: libopenmpt/examples/libopenmpt_example_c_stdout.c
+examples/libopenmpt_example_c_stdout.o: examples/libopenmpt_example_c_stdout.c
$(INFO) [CC] $<
$(VERYSILENT)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.d
$(SILENT)$(COMPILE.c) $(OUTPUT_OPTION) $<
-libopenmpt/examples/libopenmpt_example_cxx.o: libopenmpt/examples/libopenmpt_example_cxx.cpp
+examples/libopenmpt_example_cxx.o: examples/libopenmpt_example_cxx.cpp
$(INFO) [CXX] $<
$(VERYSILENT)$(CXX) $(CXXFLAGS) $(CXXFLAGS_PORTAUDIO) $(CPPFLAGS) $(CPPFLAGS_PORTAUDIO) $(TARGET_ARCH) -M -MT$@ $< > $*.d
$(SILENT)$(COMPILE.cc) $(CXXFLAGS_PORTAUDIO) $(CPPFLAGS_PORTAUDIO) $(OUTPUT_OPTION) $<
-bin/libopenmpt_example_c$(EXESUFFIX): libopenmpt/examples/libopenmpt_example_c.o $(OBJECTS_LIBOPENMPT) $(OUTPUT_LIBOPENMPT)
+bin/libopenmpt_example_c$(EXESUFFIX): examples/libopenmpt_example_c.o $(OBJECTS_LIBOPENMPT) $(OUTPUT_LIBOPENMPT)
$(INFO) [LD] $@
- $(SILENT)$(LINK.cc) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_PORTAUDIO) libopenmpt/examples/libopenmpt_example_c.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_PORTAUDIO) -o $@
+ $(SILENT)$(LINK.cc) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_PORTAUDIO) examples/libopenmpt_example_c.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_PORTAUDIO) -o $@
ifeq ($(HOST),unix)
$(SILENT)mv $@ $@.norpath
$(INFO) [LD] $@
- $(SILENT)$(LINK.cc) $(LDFLAGS_RPATH) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_PORTAUDIO) libopenmpt/examples/libopenmpt_example_c.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_PORTAUDIO) -o $@
+ $(SILENT)$(LINK.cc) $(LDFLAGS_RPATH) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_PORTAUDIO) examples/libopenmpt_example_c.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_PORTAUDIO) -o $@
endif
-bin/libopenmpt_example_c_mem$(EXESUFFIX): libopenmpt/examples/libopenmpt_example_c_mem.o $(OBJECTS_LIBOPENMPT) $(OUTPUT_LIBOPENMPT)
+bin/libopenmpt_example_c_mem$(EXESUFFIX): examples/libopenmpt_example_c_mem.o $(OBJECTS_LIBOPENMPT) $(OUTPUT_LIBOPENMPT)
$(INFO) [LD] $@
- $(SILENT)$(LINK.cc) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_PORTAUDIO) libopenmpt/examples/libopenmpt_example_c_mem.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_PORTAUDIO) -o $@
+ $(SILENT)$(LINK.cc) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_PORTAUDIO) examples/libopenmpt_example_c_mem.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_PORTAUDIO) -o $@
ifeq ($(HOST),unix)
$(SILENT)mv $@ $@.norpath
$(INFO) [LD] $@
- $(SILENT)$(LINK.cc) $(LDFLAGS_RPATH) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_PORTAUDIO) libopenmpt/examples/libopenmpt_example_c_mem.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_PORTAUDIO) -o $@
+ $(SILENT)$(LINK.cc) $(LDFLAGS_RPATH) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_PORTAUDIO) examples/libopenmpt_example_c_mem.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_PORTAUDIO) -o $@
endif
-bin/libopenmpt_example_c_stdout$(EXESUFFIX): libopenmpt/examples/libopenmpt_example_c_stdout.o $(OBJECTS_LIBOPENMPT) $(OUTPUT_LIBOPENMPT)
+bin/libopenmpt_example_c_stdout$(EXESUFFIX): examples/libopenmpt_example_c_stdout.o $(OBJECTS_LIBOPENMPT) $(OUTPUT_LIBOPENMPT)
$(INFO) [LD] $@
- $(SILENT)$(LINK.cc) $(LDFLAGS_LIBOPENMPT) libopenmpt/examples/libopenmpt_example_c_stdout.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) -o $@
+ $(SILENT)$(LINK.cc) $(LDFLAGS_LIBOPENMPT) examples/libopenmpt_example_c_stdout.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) -o $@
ifeq ($(HOST),unix)
$(SILENT)mv $@ $@.norpath
$(INFO) [LD] $@
- $(SILENT)$(LINK.cc) $(LDFLAGS_RPATH) $(LDFLAGS_LIBOPENMPT) libopenmpt/examples/libopenmpt_example_c_stdout.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) -o $@
+ $(SILENT)$(LINK.cc) $(LDFLAGS_RPATH) $(LDFLAGS_LIBOPENMPT) examples/libopenmpt_example_c_stdout.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) -o $@
endif
-bin/libopenmpt_example_cxx$(EXESUFFIX): libopenmpt/examples/libopenmpt_example_cxx.o $(OBJECTS_LIBOPENMPT) $(OUTPUT_LIBOPENMPT)
+bin/libopenmpt_example_cxx$(EXESUFFIX): examples/libopenmpt_example_cxx.o $(OBJECTS_LIBOPENMPT) $(OUTPUT_LIBOPENMPT)
$(INFO) [LD] $@
- $(SILENT)$(LINK.cc) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_PORTAUDIO) libopenmpt/examples/libopenmpt_example_cxx.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_PORTAUDIO) -o $@
+ $(SILENT)$(LINK.cc) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_PORTAUDIO) examples/libopenmpt_example_cxx.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_PORTAUDIO) -o $@
ifeq ($(HOST),unix)
$(SILENT)mv $@ $@.norpath
$(INFO) [LD] $@
- $(SILENT)$(LINK.cc) $(LDFLAGS_RPATH) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_PORTAUDIO) libopenmpt/examples/libopenmpt_example_cxx.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_PORTAUDIO) -o $@
+ $(SILENT)$(LINK.cc) $(LDFLAGS_RPATH) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_PORTAUDIO) examples/libopenmpt_example_cxx.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_PORTAUDIO) -o $@
endif
.PHONY: clean
Modified: trunk/OpenMPT/build/autotools/Makefile.am
===================================================================
--- trunk/OpenMPT/build/autotools/Makefile.am 2015-01-21 18:56:51 UTC (rev 4726)
+++ trunk/OpenMPT/build/autotools/Makefile.am 2015-01-22 11:49:05 UTC (rev 4727)
@@ -16,16 +16,18 @@
EXTRA_DIST += test/test.s3m
EXTRA_DIST += test/test.mptm
EXTRA_DIST += man/openmpt123.1
+EXTRA_DIST += examples/.clang-format
MOSTLYCLEANFILES =
dist_doc_DATA =
dist_doc_DATA += LICENSE
dist_doc_DATA += README.md
dist_doc_DATA += TODO
-dist_doc_DATA += libopenmpt/examples/libopenmpt_example_cxx.cpp
-dist_doc_DATA += libopenmpt/examples/libopenmpt_example_c_mem.c
-dist_doc_DATA += libopenmpt/examples/libopenmpt_example_c.c
-dist_doc_DATA += libopenmpt/examples/libopenmpt_example_c_stdout.c
+nobase_dist_doc_DATA =
+nobase_dist_doc_DATA += examples/libopenmpt_example_cxx.cpp
+nobase_dist_doc_DATA += examples/libopenmpt_example_c_mem.c
+nobase_dist_doc_DATA += examples/libopenmpt_example_c.c
+nobase_dist_doc_DATA += examples/libopenmpt_example_c_stdout.c
bin_PROGRAMS =
check_PROGRAMS =
@@ -39,11 +41,11 @@
check_PROGRAMS += libopenmpt_example_cxx
endif
-libopenmpt_example_c_stdout_SOURCES = libopenmpt/examples/libopenmpt_example_c_stdout.c
+libopenmpt_example_c_stdout_SOURCES = examples/libopenmpt_example_c_stdout.c
if HAVE_PORTAUDIO
-libopenmpt_example_c_SOURCES = libopenmpt/examples/libopenmpt_example_c.c
-libopenmpt_example_c_mem_SOURCES = libopenmpt/examples/libopenmpt_example_c_mem.c
-libopenmpt_example_cxx_SOURCES = libopenmpt/examples/libopenmpt_example_cxx.cpp
+libopenmpt_example_c_SOURCES = examples/libopenmpt_example_c.c
+libopenmpt_example_c_mem_SOURCES = examples/libopenmpt_example_c_mem.c
+libopenmpt_example_cxx_SOURCES = examples/libopenmpt_example_cxx.cpp
endif
libopenmpt_example_c_stdout_CPPFLAGS =
Modified: trunk/OpenMPT/build/autotools/autoconfiscate.sh
===================================================================
--- trunk/OpenMPT/build/autotools/autoconfiscate.sh 2015-01-21 18:56:51 UTC (rev 4726)
+++ trunk/OpenMPT/build/autotools/autoconfiscate.sh 2015-01-22 11:49:05 UTC (rev 4727)
@@ -32,6 +32,7 @@
svn export ./soundlib bin/dist-autotools/soundlib
svn export ./test bin/dist-autotools/test
svn export ./libopenmpt bin/dist-autotools/libopenmpt
+svn export ./examples bin/dist-autotools/examples
mkdir bin/dist-autotools/src
svn export ./openmpt123 bin/dist-autotools/src/openmpt123
#svn export ./openmpt123 bin/dist-autotools/openmpt123
Modified: trunk/OpenMPT/build/svn/run_clang-format.sh
===================================================================
--- trunk/OpenMPT/build/svn/run_clang-format.sh 2015-01-21 18:56:51 UTC (rev 4726)
+++ trunk/OpenMPT/build/svn/run_clang-format.sh 2015-01-22 11:49:05 UTC (rev 4727)
@@ -5,6 +5,6 @@
# clang-format-3.5 -i *.h *.c *.hpp *.cpp
#cd ..
-cd libopenmpt/examples
+cd examples
clang-format-3.5 -i *.c *.cpp
-cd ../..
+cd ..
Modified: trunk/OpenMPT/build/vs2008/libopenmpt_example_c/libopenmpt_example_c.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/libopenmpt_example_c/libopenmpt_example_c.vcproj 2015-01-21 18:56:51 UTC (rev 4726)
+++ trunk/OpenMPT/build/vs2008/libopenmpt_example_c/libopenmpt_example_c.vcproj 2015-01-22 11:49:05 UTC (rev 4727)
@@ -161,7 +161,7 @@
</References>
<Files>
<File
- RelativePath="..\..\..\libopenmpt\examples\libopenmpt_example_c.c"
+ RelativePath="..\..\..\examples\libopenmpt_example_c.c"
>
</File>
</Files>
Modified: trunk/OpenMPT/libopenmpt/Doxyfile
===================================================================
--- trunk/OpenMPT/libopenmpt/Doxyfile 2015-01-21 18:56:51 UTC (rev 4726)
+++ trunk/OpenMPT/libopenmpt/Doxyfile 2015-01-22 11:49:05 UTC (rev 4727)
@@ -825,7 +825,7 @@
# that contain example code fragments that are included (see the \include
# command).
-EXAMPLE_PATH = libopenmpt/examples/ LICENSE
+EXAMPLE_PATH = examples/ LICENSE
# If the value of the EXAMPLE_PATH tag contains directories, you can use the
# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
