Changeset 9da5d5fd in rtems


Ignore:
Timestamp:
Oct 6, 2018, 8:12:21 AM (8 months ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
477bca2
Parents:
637546a
git-author:
Sebastian Huber <sebastian.huber@…> (10/06/18 08:12:21)
git-committer:
Sebastian Huber <sebastian.huber@…> (10/10/18 05:57:42)
Message:

build: Directly reference libraries in tests

Remove use of TMPINSTALL_FILES.

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • cpukit/Makefile.am

    r637546a r9da5d5fd  
    55
    66project_lib_LIBRARIES =
    7 TMPINSTALL_FILES =
    87
    98project_lib_LIBRARIES += librtemscpu.a
    10 
    11 $(PROJECT_LIB)/librtemscpu.a: librtemscpu.a
    12         $(INSTALL_DATA) $< $(PROJECT_LIB)/librtemscpu.a
    13 TMPINSTALL_FILES += $(PROJECT_LIB)/librtemscpu.a
    149
    1510librtemscpu_a_SOURCES =
     
    18081803project_lib_LIBRARIES += libftpd.a
    18091804
    1810 $(PROJECT_LIB)/libftpd.a: libftpd.a
    1811         $(INSTALL_DATA) $< $(PROJECT_LIB)/libftpd.a
    1812 TMPINSTALL_FILES += $(PROJECT_LIB)/libftpd.a
    1813 
    18141805libftpd_a_SOURCES =
    18151806libftpd_a_SOURCES += ftpd/ftpd.c
     
    18181809project_lib_LIBRARIES += libftpfs.a
    18191810
    1820 $(PROJECT_LIB)/libftpfs.a: libftpfs.a
    1821         $(INSTALL_DATA) $< $(PROJECT_LIB)/libftpfs.a
    1822 TMPINSTALL_FILES += $(PROJECT_LIB)/libftpfs.a
    1823 
    18241811libftpfs_a_SOURCES =
    18251812libftpfs_a_SOURCES += libnetworking/lib/ftpfs.c
     
    18271814project_lib_LIBRARIES += libtftpfs.a
    18281815
    1829 $(PROJECT_LIB)/libtftpfs.a: libtftpfs.a
    1830         $(INSTALL_DATA) $< $(PROJECT_LIB)/libtftpfs.a
    1831 TMPINSTALL_FILES += $(PROJECT_LIB)/libtftpfs.a
    1832 
    18331816libtftpfs_a_SOURCES =
    18341817libtftpfs_a_SOURCES += libnetworking/lib/tftpDriver.c
    18351818
    18361819project_lib_LIBRARIES += libtelnetd.a
    1837 
    1838 $(PROJECT_LIB)/libtelnetd.a: libtelnetd.a
    1839         $(INSTALL_DATA) $< $(PROJECT_LIB)/libtelnetd.a
    1840 TMPINSTALL_FILES += $(PROJECT_LIB)/libtelnetd.a
    18411820
    18421821libtelnetd_a_SOURCES =
     
    18501829
    18511830project_lib_LIBRARIES += libdebugger.a
    1852 
    1853 $(PROJECT_LIB)/libdebugger.a: libdebugger.a
    1854         $(INSTALL_DATA) $< $(PROJECT_LIB)/libdebugger.a
    1855 TMPINSTALL_FILES += $(PROJECT_LIB)/libdebugger.a
    18561831
    18571832libdebugger_a_SOURCES =
     
    18681843
    18691844project_lib_LIBRARIES += libjffs2.a
    1870 
    1871 $(PROJECT_LIB)/libjffs2.a: libjffs2.a
    1872         $(INSTALL_DATA) $< $(PROJECT_LIB)/libjffs2.a
    1873 TMPINSTALL_FILES += $(PROJECT_LIB)/libjffs2.a
    18741845
    18751846libjffs2_a_SOURCES =
     
    19001871project_lib_LIBRARIES += libz.a
    19011872
    1902 $(PROJECT_LIB)/libz.a: libz.a
    1903         $(INSTALL_DATA) $< $(PROJECT_LIB)/libz.a
    1904 TMPINSTALL_FILES += $(PROJECT_LIB)/libz.a
    1905 
    19061873libz_a_SOURCES =
    19071874libz_a_SOURCES += zlib/adler32.c
     
    19251892project_lib_LIBRARIES += libnfs.a
    19261893
    1927 $(PROJECT_LIB)/libnfs.a: libnfs.a
    1928         $(INSTALL_DATA) $< $(PROJECT_LIB)/libnfs.a
    1929 TMPINSTALL_FILES += $(PROJECT_LIB)/libnfs.a
    1930 
    19311894libnfs_a_SOURCES =
    19321895libnfs_a_SOURCES += libfs/src/nfsclient/proto/mount_prot_xdr.c
     
    19381901
    19391902project_lib_LIBRARIES += libpppd.a
    1940 
    1941 $(PROJECT_LIB)/libpppd.a: libpppd.a
    1942         $(INSTALL_DATA) $< $(PROJECT_LIB)/libpppd.a
    1943 TMPINSTALL_FILES += $(PROJECT_LIB)/libpppd.a
    19441903
    19451904libpppd_a_SOURCES =
     
    19651924project_lib_LIBRARIES += libmghttpd.a
    19661925
    1967 $(PROJECT_LIB)/libmghttpd.a: libmghttpd.a
    1968         $(INSTALL_DATA) $< $(PROJECT_LIB)/libmghttpd.a
    1969 TMPINSTALL_FILES += $(PROJECT_LIB)/libmghttpd.a
    1970 
    19711926libmghttpd_a_SOURCES =
    19721927libmghttpd_a_SOURCES += mghttpd/mongoose.c
  • testsuites/automake/compile.am

    r637546a r9da5d5fd  
    99STRIP = @STRIP@
    1010
    11 ##
     11TEST_LD_FLAGS = -Wl,--wrap=printf -Wl,--wrap=puts -Wl,--wrap=putchar
     12
    1213AM_CPPFLAGS = $(TEST_FLAGS) @RTEMS_CPPFLAGS@ @RTEMS_BSP_CPPFLAGS@
    1314AM_CFLAGS   = $(TEST_C_FLAGS)
    1415AM_CXXFLAGS = $(TEST_CXX_FLAGS)
    15 AM_LDFLAGS  = -B$(RTEMS_BSP_LIBBSP_PATH) $(GCCSPECS) \
    16               -L$(PROJECT_LIB) \
    17               -L$(RTEMS_BSP_ARCH_LINKCMDS_PATH) \
    18               $(TEST_LD_FLAGS)
     16
     17AM_LDFLAGS =
     18AM_LDFLAGS += -B$(RTEMS_ROOT)lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@
     19AM_LDFLAGS += $(GCCSPECS)
     20AM_LDFLAGS += -L$(RTEMS_ROOT)cpukit
     21AM_LDFLAGS += -L$(RTEMS_BSP_ARCH_LINKCMDS_PATH)
     22AM_LDFLAGS += $(TEST_LD_FLAGS)
     23
     24LDADD =
     25LDADD += $(RTEMS_ROOT)lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/librtemsbsp.a
     26LDADD += $(RTEMS_ROOT)cpukit/librtemscpu.a
    1927
    2028CLEANFILES = *.num *.nxe *.elf *.srec* *.bin *.bt *.ralf
  • testsuites/fstests/Makefile.am

    r637546a r9da5d5fd  
    134134fsjffs2gc01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fsjffs2gc01) \
    135135        $(support_includes) $(test_includes) -I$(top_srcdir)/jffs2_support
    136 fsjffs2gc01_LDADD = -ljffs2
     136fsjffs2gc01_LDADD = $(RTEMS_ROOT)cpukit/libjffs2.a $(LDADD)
    137137endif
    138138
     
    268268jffs2_fserror_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_jffs2_fserror) \
    269269        $(support_includes) $(test_includes) -I$(top_srcdir)/jffs2_support
    270 jffs2_fserror_LDADD = -ljffs2
     270jffs2_fserror_LDADD = $(RTEMS_ROOT)cpukit/libjffs2.a $(LDADD)
    271271endif
    272272
     
    280280jffs2_fslink_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_jffs2_fslink) \
    281281        $(support_includes) $(test_includes) -I$(top_srcdir)/jffs2_support
    282 jffs2_fslink_LDADD = -ljffs2
     282jffs2_fslink_LDADD = $(RTEMS_ROOT)cpukit/libjffs2.a $(LDADD)
    283283endif
    284284
     
    293293        $(TEST_FLAGS_jffs2_fspatheval) $(support_includes) $(test_includes) \
    294294        -I$(top_srcdir)/jffs2_support
    295 jffs2_fspatheval_LDADD = -ljffs2
     295jffs2_fspatheval_LDADD = $(RTEMS_ROOT)cpukit/libjffs2.a $(LDADD)
    296296endif
    297297
     
    306306        $(TEST_FLAGS_jffs2_fspermission) $(support_includes) $(test_includes) \
    307307        -I$(top_srcdir)/jffs2_support
    308 jffs2_fspermission_LDADD = -ljffs2
     308jffs2_fspermission_LDADD = $(RTEMS_ROOT)cpukit/libjffs2.a $(LDADD)
    309309endif
    310310
     
    318318jffs2_fsrdwr_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_jffs2_fsrdwr) \
    319319        $(support_includes) $(test_includes) -I$(top_srcdir)/jffs2_support
    320 jffs2_fsrdwr_LDADD = -ljffs2
     320jffs2_fsrdwr_LDADD = $(RTEMS_ROOT)cpukit/libjffs2.a $(LDADD)
    321321endif
    322322
     
    331331        $(TEST_FLAGS_jffs2_fsscandir01) $(support_includes) $(test_includes) \
    332332        -I$(top_srcdir)/jffs2_support
    333 jffs2_fsscandir01_LDADD = -ljffs2
     333jffs2_fsscandir01_LDADD = $(RTEMS_ROOT)cpukit/libjffs2.a $(LDADD)
    334334endif
    335335
     
    344344        $(TEST_FLAGS_jffs2_fssymlink) $(support_includes) $(test_includes) \
    345345        -I$(top_srcdir)/jffs2_support
    346 jffs2_fssymlink_LDADD = -ljffs2
     346jffs2_fssymlink_LDADD = $(RTEMS_ROOT)cpukit/libjffs2.a $(LDADD)
    347347endif
    348348
     
    356356jffs2_fstime_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_jffs2_fstime) \
    357357        $(support_includes) $(test_includes) -I$(top_srcdir)/jffs2_support
    358 jffs2_fstime_LDADD = -ljffs2
     358jffs2_fstime_LDADD = $(RTEMS_ROOT)cpukit/libjffs2.a $(LDADD)
    359359endif
    360360
  • testsuites/libtests/Makefile.am

    r637546a r9da5d5fd  
    247247debugger01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_debugger01) \
    248248        $(support_includes)
    249 debugger01_LDADD = -ldebugger
     249debugger01_LDADD = $(RTEMS_ROOT)cpukit/libdebugger.a $(LDADD)
    250250endif
    251251endif
     
    583583ftp01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_ftp01) \
    584584        $(support_includes) -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
    585 ftp01_LDADD = -lftpd -lftpfs
     585ftp01_LDADD = $(RTEMS_ROOT)cpukit/libftpd.a $(RTEMS_ROOT)cpukit/libftpfs.a $(LDADD)
    586586endif
    587587endif
     
    795795mghttpd01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mghttpd01) \
    796796        $(support_includes) -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
    797 mghttpd01_LDADD = -lmghttpd
     797mghttpd01_LDADD = $(RTEMS_ROOT)cpukit/libmghttpd.a $(LDADD)
    798798mghttpd01_tar.c: mghttpd01/mghttpd01.tar
    799799        $(AM_V_GEN)$(BIN2C) -C $< $@
     
    10571057tar01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tar01) \
    10581058        $(support_includes) $(test_includes) -I$(top_srcdir)/include
    1059 tar01_LDADD = -lrtemscpu -lz
     1059tar01_LDADD = $(RTEMS_ROOT)cpukit/librtemscpu.a $(RTEMS_ROOT)cpukit/libz.a $(LDADD)
    10601060tar01.tar: Makefile
    10611061        $(AM_V_GEN)rm -rf tar01_fs
  • testsuites/samples/Makefile.am

    r637546a r9da5d5fd  
    133133pppd_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_pppd) $(support_includes) \
    134134        -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
    135 pppd_LDADD = -lpppd
     135pppd_LDADD = $(RTEMS_ROOT)cpukit/libpppd.a $(LDADD)
    136136endif
    137137endif
Note: See TracChangeset for help on using the changeset viewer.