diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:55:29 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:55:29 +0000 |
| commit | f58a97d3de5b43fd2cf8c0928939241b7b01c67d (patch) | |
| tree | 4891542955626efe83bf431c67414e4901d33e74 /buildlib | |
| parent | 70fbac25ae36f62b99a9df1a4a7742a47a8d91ec (diff) | |
| download | apt-f58a97d3de5b43fd2cf8c0928939241b7b01c67d.tar.gz | |
Moved time handling, fixed makefiles
Author: jgg
Date: 1999-12-10 07:21:52 GMT
Moved time handling, fixed makefiles
Diffstat (limited to 'buildlib')
| -rw-r--r-- | buildlib/defaults.mak | 3 | ||||
| -rw-r--r-- | buildlib/environment.mak.in | 6 | ||||
| -rw-r--r-- | buildlib/makefile.in | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index 47f297cdf..6e504390c 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -79,6 +79,8 @@ PROGRAM_H = $(BASE)/buildlib/program.mak COPY_H = $(BASE)/buildlib/copy.mak YODL_MANPAGE_H = $(BASE)/buildlib/yodl_manpage.mak +include $(BUILD)/environment.mak + ifdef STATICLIBS LIBRARY_H += $(BASE)/buildlib/staticlibrary.mak endif @@ -100,7 +102,6 @@ SUBDIRS+= HEADER_TARGETDIRS+= # Options -include $(BUILD)/environment.mak CPPFLAGS+= -I$(INCLUDE) LDFLAGS+= -L$(LIB) diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index 6d721c711..e7545bac8 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -39,8 +39,10 @@ HAVE_STATVFS = @HAVE_STATVFS@ # Shared library things HOST_OS = @host_os@ ifeq ($(HOST_OS),linux-gnu) - ONLYSHAREDLIBS = yes SONAME_MAGIC=-Wl,-soname -Wl, LFLAGS_SO= +else + # Do not know how to creat shared libraries here. + ONLYSTATICLIBS = yes endif - + diff --git a/buildlib/makefile.in b/buildlib/makefile.in index 677aee4d3..4eb64606c 100644 --- a/buildlib/makefile.in +++ b/buildlib/makefile.in @@ -40,11 +40,11 @@ endif ifeq ($(HAVE_C9X),yes) @rm -f include/inttypes.h > /dev/null 2>&1 else - @cp $(SRCDIR)/buildlib/inttypes.h.in include/inttypes.h + @cp -p $(SRCDIR)/buildlib/inttypes.h.in include/inttypes.h endif ifeq ($(HAVE_STATVFS),yes) @rm -f include/statvfs.h > /dev/null 2>&1 else - @cp $(SRCDIR)/buildlib/statvfs.h.in include/statvfs.h + @cp -p $(SRCDIR)/buildlib/statvfs.h.in include/statvfs.h ln -sf . include/sys endif |