diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-09 12:21:34 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-09 12:21:34 +0000 |
| commit | a079546663f48ceabb8028647d32000f8f604ead (patch) | |
| tree | 587fe57cc4707f949be800dbab8e9f666082ba74 /c/src/libchip | |
| parent | 2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-a079546663f48ceabb8028647d32000f8f604ead.tar.bz2 | |
2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Fix variant-tmpinstall support.
Diffstat (limited to 'c/src/libchip')
| -rw-r--r-- | c/src/libchip/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/libchip/Makefile.am | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/c/src/libchip/ChangeLog b/c/src/libchip/ChangeLog index 4ce91db2e7..b07198e9a1 100644 --- a/c/src/libchip/ChangeLog +++ b/c/src/libchip/ChangeLog @@ -1,3 +1,7 @@ +2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Fix variant-tmpinstall support. + 2003-12-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * ide/Makefile.am, network/Makefile.am, rtc/Makefile.am, diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am index 8e94fea6a1..1fb45433e8 100644 --- a/c/src/libchip/Makefile.am +++ b/c/src/libchip/Makefile.am @@ -56,19 +56,14 @@ network/$(ARCH)/$(dirstamp): @: > network/$(ARCH)/$(dirstamp) network/$(ARCH)/%.$(OBJEXT): network/%.c network/$(ARCH)/$(dirstamp) ${COMPILE} $(libnetchip_CPPFLAGS) -o $@ -c $< -network/$(ARCH)/libnetchip.a: $(libnetchip_OBJS) +network/$(ARCH)/libnetchip$(LIB_VARIANT).a: $(libnetchip_OBJS) $(make-library) -TMP_LIBS += network/$(ARCH)/libnetchip.a +TMP_LIBS += network/$(ARCH)/libnetchip$(LIB_VARIANT).a -$(PROJECT_RELEASE)/lib/libnetchip$(LIB_VARIANT).a: network/$(ARCH)/libnetchip.a - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/libnetchip$(LIB_VARIANT).a +project_lib_DATA = network/$(ARCH)/libnetchip$(LIB_VARIANT).a endif endif -.PRECIOUS: network/$(ARCH)/libnetchip.a - libnetchip_DOC_FILES = network/README network/README.cs8900 \ network/README.dec21140 network/README.i82586 network/README.open_eth \ network/README.sonic network/cs8900.c.bsp @@ -190,6 +185,10 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mii.h $(PROJECT_INCLUDE)/libchip/open_eth.h: network/open_eth.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/open_eth.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/open_eth.h + +${PROJECT_RELEASE}/lib/libnetchip$(LIB_VARIANT).a: network/$(ARCH)/libnetchip$(LIB_VARIANT).a ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/libnetchip$(LIB_VARIANT).a +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/libnetchip$(LIB_VARIANT).a endif endif |