Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-11-16 12:34:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Merge libdrvmgr/Makefile.am

Browse Source
This commit is contained in:
Sebastian Huber
2018-09-14 06:22:19 +02:00
parent 551f4736b3
commit d3d1243487
4 changed files with 23 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cpukit/Makefile.am
View File

@@ -327,6 +327,29 @@ libcpukit_a_SOURCES += libdl/rtl-unwind-dw2.c
endif endif
if LIBDRVMGR
libcpukit_a_SOURCES += libdrvmgr/drvmgr_by_id.c
libcpukit_a_SOURCES += libdrvmgr/drvmgr_by_name.c
libcpukit_a_SOURCES += libdrvmgr/drvmgr.c
libcpukit_a_SOURCES += libdrvmgr/drvmgr_dev_by_name.c
libcpukit_a_SOURCES += libdrvmgr/drvmgr_drvinf.c
libcpukit_a_SOURCES += libdrvmgr/drvmgr_for_each_dev.c
libcpukit_a_SOURCES += libdrvmgr/drvmgr_for_each_list_dev.c
libcpukit_a_SOURCES += libdrvmgr/drvmgr_func.c
libcpukit_a_SOURCES += libdrvmgr/drvmgr_func_call.c
libcpukit_a_SOURCES += libdrvmgr/drvmgr_init.c
libcpukit_a_SOURCES += libdrvmgr/drvmgr_list.c
libcpukit_a_SOURCES += libdrvmgr/drvmgr_lock.c
libcpukit_a_SOURCES += libdrvmgr/drvmgr_print.c
libcpukit_a_SOURCES += libdrvmgr/drvmgr_res.c
libcpukit_a_SOURCES += libdrvmgr/drvmgr_rw.c
libcpukit_a_SOURCES += libdrvmgr/drvmgr_translate.c
libcpukit_a_SOURCES += libdrvmgr/drvmgr_translate_check.c
libcpukit_a_SOURCES += libdrvmgr/drvmgr_unregister.c
endif
# #
# Create a new Version VC Key header if the VC state has changed. # Create a new Version VC Key header if the VC state has changed.
# #
@@ -363,7 +386,6 @@ all-local: generate-vc-key
# librtemscpu # librtemscpu
_SUBDIRS = . score rtems posix _SUBDIRS = . score rtems posix
_SUBDIRS += libfs _SUBDIRS += libfs
_SUBDIRS += libdrvmgr
_SUBDIRS += libnetworking librpc _SUBDIRS += libnetworking librpc
_SUBDIRS += libpci _SUBDIRS += libpci
_SUBDIRS += libi2c _SUBDIRS += libi2c

1
cpukit/configure.ac
View File

@@ -497,7 +497,6 @@ score/cpu/v850/Makefile
score/cpu/x86_64/Makefile score/cpu/x86_64/Makefile
score/cpu/no_cpu/Makefile score/cpu/no_cpu/Makefile
posix/Makefile posix/Makefile
libdrvmgr/Makefile
libfs/Makefile libfs/Makefile
libfs/src/nfsclient/Makefile libfs/src/nfsclient/Makefile
libgnat/Makefile libgnat/Makefile

32
cpukit/libdrvmgr/Makefile.am
View File

@@ -1,32 +0,0 @@
include $(top_srcdir)/automake/compile.am
if LIBDRVMGR
noinst_LIBRARIES = libdrvmgr.a
libdrvmgr_a_SOURCES = drvmgr.c
libdrvmgr_a_SOURCES += drvmgr.h
libdrvmgr_a_SOURCES += drvmgr_by_name.c
libdrvmgr_a_SOURCES += drvmgr_by_id.c
libdrvmgr_a_SOURCES += drvmgr_dev_by_name.c
libdrvmgr_a_SOURCES += drvmgr_drvinf.c
libdrvmgr_a_SOURCES += drvmgr_init.c
libdrvmgr_a_SOURCES += drvmgr_confdefs.h
libdrvmgr_a_SOURCES += drvmgr_for_each_dev.c
libdrvmgr_a_SOURCES += drvmgr_for_each_list_dev.c
libdrvmgr_a_SOURCES += drvmgr_func.c
libdrvmgr_a_SOURCES += drvmgr_func_call.c
libdrvmgr_a_SOURCES += drvmgr_list.c
libdrvmgr_a_SOURCES += drvmgr_list.h
libdrvmgr_a_SOURCES += drvmgr_lock.c
libdrvmgr_a_SOURCES += drvmgr_print.c
libdrvmgr_a_SOURCES += drvmgr_res.c
libdrvmgr_a_SOURCES += drvmgr_rw.c
libdrvmgr_a_SOURCES += drvmgr_translate.c
libdrvmgr_a_SOURCES += drvmgr_translate_check.c
libdrvmgr_a_SOURCES += drvmgr_unregister.c
endif
include $(top_srcdir)/automake/local.am

4
cpukit/wrapup/Makefile.am
View File

@@ -72,10 +72,6 @@ if LIBPCI
TMP_LIBS += ../libpci/libpci.a TMP_LIBS += ../libpci/libpci.a
endif endif
if LIBDRVMGR
TMP_LIBS += ../libdrvmgr/libdrvmgr.a
endif
if LIBNETWORKING if LIBNETWORKING
TMP_LIBS += ../libnetworking/libnetworking.a TMP_LIBS += ../libnetworking/libnetworking.a
TMP_LIBS += ../librpc/librpc.a TMP_LIBS += ../librpc/librpc.a