Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-26 14:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org>

Browse Source 
* Makefile.am: Merge-in make/Makefile.am.
	* configure.ac: Reflect change above.
This commit is contained in:
Ralf Corsepius
2011-03-04 18:32:15 +00:00
parent c34f2b2ba7
commit 86c2108d92
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Merge-in make/Makefile.am.
* configure.ac: Reflect change above.
2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.maint, aclocal/rpm.m4, aclocal/rtems-top.m4,

17
Makefile.am
View File

@@ -7,7 +7,7 @@
ACLOCAL_AMFLAGS = -I aclocal
SUBDIRS = make $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS)
SUBDIRS = $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS)
DIST_SUBDIRS = $(SUBDIRS)
noinst_SCRIPTS = bootstrap
@@ -40,5 +40,20 @@ dist-hook:
f=`echo $$a | sed 's,\.in$$,,'`; \
if test -f $$f; then echo "rm $$f"; rm $$f; fi; done
rtems_makedir = $(prefix)/make
dist_rtems_make_DATA = make/main.cfg make/leaf.cfg
EXTRA_DIST += make/host.cfg.in
rtems_make_Templatesdir = $(rtems_makedir)/Templates
dist_rtems_make_Templates_DATA = make/Templates/Makefile.dir \
make/Templates/Makefile.leaf make/Templates/Makefile.lib
rtems_make_customdir = $(rtems_makedir)/custom
dist_rtems_make_custom_DATA = make/custom/default.cfg
include $(top_srcdir)/automake/subdirs.am
include $(top_srcdir)/automake/host.am

4
configure.ac
View File

@@ -67,8 +67,6 @@ AS_IF([test x"$enable_multilib" = x"yes"],[
])
RTEMS_TARGET_CONFIG_SUBDIRS([c])
AC_CONFIG_FILES([Makefile
make/Makefile
])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT