Commit 719348b6 authored by ShadowKyogre's avatar ShadowKyogre Committed by Alexei Sorokin

Build system changes

parent 21100bb3
# outputs
Makefile
Makefile.in
*.so
*.o
*.lo
*.la
*.a
.libs
.deps
*_options.c
*_options.h
*.xml
# automake stuff
config.h*
config.log
config.status
config.sub
configure
config.guess
compile
autom4te.cache
aclocal.m4
depcomp
install-sh
libtool
ltmain.sh
missing
stamp-h1
This diff is collapsed.
......@@ -8,6 +8,7 @@ AM_MAINTAINER_MODE
AC_ISC_POSIX
AC_PROG_CC
AC_PROG_CPP
AC_PROG_CXX
AC_PROG_LIBTOOL
AC_HEADER_STDC
AC_CHECK_HEADERS([stdlib.h sys/time.h unistd.h])
......@@ -85,9 +86,9 @@ AC_SUBST(compdatadir)
dnl ============================================================
dnl Check for the pkg-config path.
if test x"$PKG_CONFIG_PATH" = x; then
PKG_CONFIG_PATH=${prefix}/lib/pkgconfig
PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig
else
PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${PKG_CONFIG_PATH}
PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${PKG_CONFIG_PATH}
fi
export PKG_CONFIG_PATH
AC_SUBST(PKG_CONFIG_PATH)
......@@ -123,6 +124,8 @@ AC_SUBST(GL_LIBS)
AC_OUTPUT([
Makefile
images/Makefile
images/elements/Makefile
images/snow/Makefile
include/Makefile
metadata/Makefile
src/Makefile
......
imagesdir = $(imagedir)
images_DATA = \
autumn1.png \
autumn2.png \
bubbles1.png \
bubbles2.png \
fireflies1.svg \
fireflies2.svg \
snow1.png \
snow2.png \
snowflake.png \
stars1.png
EXTRA_DIST = \
autumn1.png \
autumn2.png \
bubbles1.png \
bubbles2.png \
fireflies1.svg \
fireflies2.svg \
snow1.png \
snow2.png \
snowflake.png \
stars1.png
SUBDIRS = elements snow
imagesdir = $(imagedir)/elements
images_DATA = \
autumn1.png \
autumn2.png \
bubbles1.png \
bubbles2.png \
fireflies1.svg \
fireflies2.svg \
snow1.png \
snow2.png \
stars1.png
EXTRA_DIST = \
autumn1.png \
autumn2.png \
bubbles1.png \
bubbles2.png \
snow1.png \
snow2.png \
stars1.png
imagesdir = $(imagedir)/snow
images_DATA = \
snowflake.png
EXTRA_DIST = \
snowflake.png
xmldir = $(metadatadir)
xml_in_files = \
xml_in_files = \
atlantis.xml.in \
cubemodel.xml.in \
elements.xml.in \
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -99,7 +99,7 @@
<hints>file;image;</hints>
<type>string</type>
<default>
<value>snowflake.png</value>
<value>snow/snowflake.png</value>
</default>
</option>
</group>
......@@ -127,4 +127,3 @@
</display>
</plugin>
</compiz>
......@@ -131,4 +131,3 @@
</display>
</plugin>
</compiz>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment