Changeset ee4e7f0 in rtems


Ignore:
Timestamp:
May 26, 2015, 1:17:50 PM (5 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, 5, master
Children:
67901a82
Parents:
5774c414
git-author:
Sebastian Huber <sebastian.huber@…> (05/26/15 13:17:50)
git-committer:
Sebastian Huber <sebastian.huber@…> (05/27/15 06:53:05)
Message:

jffs2: Move into separate library

In case the zlib compression was used, then the librtemscpu.a depended
on libz.a. To avoid a GCC patch or complicated link flags move the
JFFS2 support into a separate library to use a simple "-ljffs2 -lz" to
link the executable.

Files:
11 edited

Legend:

Unmodified
Added
Removed
  • cpukit/libfs/Makefile.am

    r5774c414 ree4e7f0  
    110110
    111111# JFFS2
    112 noinst_LIBRARIES += libjffs2.a
     112project_lib_LIBRARIES = libjffs2.a
    113113libjffs2_a_SOURCES =
    114114libjffs2_a_SOURCES += src/jffs2/src/build.c
  • cpukit/libfs/preinstall.am

    r5774c414 ree4e7f0  
    66endif
    77
     8PREINSTALL_DIRS =
     9DISTCLEANFILES = $(PREINSTALL_DIRS)
     10
     11all-local: $(TMPINSTALL_FILES)
     12
     13TMPINSTALL_FILES =
     14CLEANFILES = $(TMPINSTALL_FILES)
     15
     16$(PROJECT_LIB)/$(dirstamp):
     17        @$(MKDIR_P) $(PROJECT_LIB)
     18        @: > $(PROJECT_LIB)/$(dirstamp)
     19PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
     20
     21$(PROJECT_LIB)/libjffs2.a: libjffs2.a $(PROJECT_LIB)/$(dirstamp)
     22        $(INSTALL_DATA) $< $(PROJECT_LIB)/libjffs2.a
     23TMPINSTALL_FILES += $(PROJECT_LIB)/libjffs2.a
     24
  • cpukit/wrapup/Makefile.am

    r5774c414 ree4e7f0  
    3030TMP_LIBS += ../libfs/libimfs.a
    3131TMP_LIBS += ../libfs/librfs.a
    32 TMP_LIBS += ../libfs/libjffs2.a
    3332
    3433TMP_LIBS += ../libmisc/libmonitor.a
  • testsuites/fstests/jffs2_fserror/Makefile.am

    r5774c414 ree4e7f0  
    88jffs2_fserror_SOURCES += ../jffs2_support/fs_support.c
    99jffs2_fserror_SOURCES += ../jffs2_support/fs_config.h
     10jffs2_fserror_LDADD = -ljffs2
    1011
    1112dist_rtems_tests_DATA = jffs2_fserror.scn
     
    2223AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
    2324
    24 LINK_OBJS = $(jffs2_fserror_OBJECTS)
     25LINK_OBJS = $(jffs2_fserror_OBJECTS) $(jffs2_fserror_LDADD)
    2526LINK_LIBS = $(jffs2_fserror_LDLIBS)
    2627
  • testsuites/fstests/jffs2_fslink/Makefile.am

    r5774c414 ree4e7f0  
    88jffs2_fslink_SOURCES += ../jffs2_support/fs_support.c
    99jffs2_fslink_SOURCES += ../jffs2_support/fs_config.h
     10jffs2_fslink_LDADD = -ljffs2
    1011
    1112dist_rtems_tests_DATA = jffs2_fslink.scn
     
    2223AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
    2324
    24 LINK_OBJS = $(jffs2_fslink_OBJECTS)
     25LINK_OBJS = $(jffs2_fslink_OBJECTS) $(jffs2_fslink_LDADD)
    2526LINK_LIBS = $(jffs2_fslink_LDLIBS)
    2627
  • testsuites/fstests/jffs2_fspatheval/Makefile.am

    r5774c414 ree4e7f0  
    88jffs2_fspatheval_SOURCES += ../jffs2_support/fs_support.c
    99jffs2_fspatheval_SOURCES += ../jffs2_support/fs_config.h
     10jffs2_fspatheval_LDADD = -ljffs2
    1011
    1112dist_rtems_tests_DATA = jffs2_fspatheval.scn
     
    2223AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
    2324
    24 LINK_OBJS = $(jffs2_fspatheval_OBJECTS)
     25LINK_OBJS = $(jffs2_fspatheval_OBJECTS) $(jffs2_fspatheval_LDADD)
    2526LINK_LIBS = $(jffs2_fspatheval_LDLIBS)
    2627
  • testsuites/fstests/jffs2_fspermission/Makefile.am

    r5774c414 ree4e7f0  
    88jffs2_fspermission_SOURCES += ../jffs2_support/fs_support.c
    99jffs2_fspermission_SOURCES += ../jffs2_support/fs_config.h
     10jffs2_fspermission_LDADD = -ljffs2
    1011
    1112dist_rtems_tests_DATA = jffs2_fspermission.scn
     
    2223AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
    2324
    24 LINK_OBJS = $(jffs2_fspermission_OBJECTS)
     25LINK_OBJS = $(jffs2_fspermission_OBJECTS) $(jffs2_fspermission_LDADD)
    2526LINK_LIBS = $(jffs2_fspermission_LDLIBS)
    2627
  • testsuites/fstests/jffs2_fsrdwr/Makefile.am

    r5774c414 ree4e7f0  
    88jffs2_fsrdwr_SOURCES += ../jffs2_support/fs_support.c
    99jffs2_fsrdwr_SOURCES += ../jffs2_support/fs_config.h
     10jffs2_fsrdwr_LDADD = -ljffs2
    1011
    1112dist_rtems_tests_DATA = jffs2_fsrdwr.scn
     
    2223AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
    2324
    24 LINK_OBJS = $(jffs2_fsrdwr_OBJECTS)
     25LINK_OBJS = $(jffs2_fsrdwr_OBJECTS) $(jffs2_fsrdwr_LDADD)
    2526LINK_LIBS = $(jffs2_fsrdwr_LDLIBS)
    2627
  • testsuites/fstests/jffs2_fsscandir01/Makefile.am

    r5774c414 ree4e7f0  
    88jffs2_fsscandir01_SOURCES += ../jffs2_support/fs_support.c
    99jffs2_fsscandir01_SOURCES += ../jffs2_support/fs_config.h
     10jffs2_fsscandir01_LDADD = -ljffs2
    1011
    1112dist_rtems_tests_DATA = jffs2_fsscandir01.scn
     
    2223AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
    2324
    24 LINK_OBJS = $(jffs2_fsscandir01_OBJECTS)
     25LINK_OBJS = $(jffs2_fsscandir01_OBJECTS) $(jffs2_fsscandir01_LDADD)
    2526LINK_LIBS = $(jffs2_fsscandir01_LDLIBS)
    2627
  • testsuites/fstests/jffs2_fssymlink/Makefile.am

    r5774c414 ree4e7f0  
    88jffs2_fssymlink_SOURCES += ../jffs2_support/fs_support.c
    99jffs2_fssymlink_SOURCES += ../jffs2_support/fs_config.h
     10jffs2_fssymlink_LDADD = -ljffs2
    1011
    1112dist_rtems_tests_DATA = jffs2_fssymlink.scn
     
    2223AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
    2324
    24 LINK_OBJS = $(jffs2_fssymlink_OBJECTS)
     25LINK_OBJS = $(jffs2_fssymlink_OBJECTS) $(jffs2_fssymlink_LDADD)
    2526LINK_LIBS = $(jffs2_fssymlink_LDLIBS)
    2627
  • testsuites/fstests/jffs2_fstime/Makefile.am

    r5774c414 ree4e7f0  
    88jffs2_fstime_SOURCES += ../jffs2_support/fs_support.c
    99jffs2_fstime_SOURCES += ../jffs2_support/fs_config.h
     10jffs2_fstime_LDADD = -ljffs2
    1011
    1112dist_rtems_tests_DATA = jffs2_fstime.scn
     
    2223AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
    2324
    24 LINK_OBJS = $(jffs2_fstime_OBJECTS)
     25LINK_OBJS = $(jffs2_fstime_OBJECTS) $(jffs2_fstime_LDADD)
    2526LINK_LIBS = $(jffs2_fstime_LDLIBS)
    2627
Note: See TracChangeset for help on using the changeset viewer.