diff options
| author | Felipe Contreras <felipe.contreras@nokia.com> | 2008-06-23 14:41:16 +0000 |
|---|---|---|
| committer | Felipe Contreras <felipe.contreras@nokia.com> | 2008-06-23 14:41:16 +0000 |
| commit | f7cd7b9ec995e2d68dda731f7a926ec78e6f2ba6 (patch) | |
| tree | 9af5bb661facb20c70adff2a7cd1c811d1bcce84 | |
| parent | cbf0610ff1614dc9b3d3b4fb5dac690f131ea3e6 (diff) | |
Build system updates.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | tests/standalone/Makefile | 7 |
3 files changed, 15 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 2318ae2..ca8315b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,3 +3,5 @@ SUBDIRS = util omx tests common include $(top_srcdir)/common/release.mak EXTRA_DIST = autogen.sh + +ACLOCAL_AMFLAGS = -I m4 -I common/m4 diff --git a/configure.ac b/configure.ac index 34c110c..57df3f4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ([2.52]) -AC_INIT([GstOpenMAX], [0.10.0.4], [http://freedesktop.org/wiki/GstOpenMAX], [gst-openmax]) +AC_INIT([gst-openmax], [0.10.0.4], [http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer&component=gst-openmax], [gst-openmax]) AC_CONFIG_AUX_DIR([config]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([-Wall -Wno-portability]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile \ omx/Makefile \ @@ -15,9 +15,6 @@ dnl versions of GStreamer GST_MAJORMINOR=0.10 GST_REQUIRED=0.10.0 -dnl initialize GStreamer macros -AG_GST_INIT - dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode AM_MAINTAINER_MODE @@ -28,8 +25,11 @@ AC_PROG_INSTALL AC_PROG_LIBTOOL AM_PATH_CHECK -dnl add GStreamer macros for aclocal -AC_SUBST(ACLOCAL_AMFLAGS, ["-I common/m4"]) +dnl Keep correct libtool macros in-tree. +AC_CONFIG_MACRO_DIR([m4]) + +dnl initialize GStreamer macros +AG_GST_INIT dnl define an ERROR_CFLAGS Makefile variable AG_GST_SET_ERROR_CFLAGS($GST_CVS) diff --git a/tests/standalone/Makefile b/tests/standalone/Makefile index ad8f613..e316d45 100644 --- a/tests/standalone/Makefile +++ b/tests/standalone/Makefile @@ -8,6 +8,7 @@ libomxil_foo_so_LIBADD = $(GTHREAD_LIBS) $(top_srcdir)/util/.libs/libutil.a CFLAGS = -ggdb top_srcdir = ../.. +srcdir = . CC = gcc LIBRARIES = $(noinst_LIBRARIES) GTHREAD_CFLAGS=`pkg-config --cflags gthread-2.0` @@ -23,9 +24,13 @@ libomxil-foo.so: LIBS := $(libomxil_foo_so_LIBADD) %.so:: $(CC) $(LDFLAGS) -shared -o $@ $^ $(LIBS) -.PHONY: clean install +.PHONY: clean distclean install clean: rm -rf *.o $(LIBRARIES) install: +distdir: + cp -pR $(srcdir)/core.c $(distdir) + cp -pR $(srcdir)/Makefile $(distdir) +distclean: clean |