* create both libinternal-diet.a and libinternal-glibc.a. This is
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Thu, 17 Mar 2005 14:51:30 +0000 (14:51 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Thu, 17 Mar 2005 14:51:30 +0000 (14:51 +0000)
  needed to avoid segfaults with gcc4 when linking against glibc based
  libraries like 'beecrypt'. Perhaps, these segfaults are a problem
  with gcc4 as they do not happen with gcc33...

* added unify-isiunlinkable.c

git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1895 94cd875c-1c1d-0410-91d2-eb244daf1a30

util-vserver/lib_internal/Makefile-files

index a8e4e6d..1881841 100644 (file)
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ##  
 
+
+LIBINTERNAL_GLIBC =            lib_internal/libinternal-glibc.a
+noinst_LIBRARIES +=            $(LIBINTERNAL_GLIBC)
+
+if USE_DIETLIBC
+LIBINTERNAL_DIET =             lib_internal/libinternal-diet.a
+LIBINTERNAL =                  $(LIBINTERNAL_DIET)
+noinst_LIBRARIES +=            $(LIBINTERNAL_DIET)
+else
+LIBINTERNAL_DIET =             lib-dietlibc-not-enabled-error.a
+LIBINTERNAL =                  $(LIBINTERNAL_GLIBC)
+endif
+
+
 command_SRCS =                 lib_internal/command-appendparameter.c \
                                lib_internal/command-setparams.c \
                                lib_internal/command-exec.c\
@@ -33,7 +47,6 @@ filecfg_SRCS =                        lib_internal/filecfg.h \
                                lib_internal/filecfg-readentrystr.c
 endif
 
-noinst_LIBRARIES +=            lib_internal/libinternal.a
 noinst_HEADERS += \
                                lib_internal/coreassert.h \
                                lib_internal/errinfo.h \
@@ -59,7 +72,7 @@ noinst_HEADERS += \
                                lib_internal/util-unixsock.h \
                                lib_internal/string.hc
 
-lib_internal_libinternal_a_SOURCES = \
+lib_internal_libinternal_common_SRCS = \
                                lib_internal/errinfo-writeerrno.c \
                                lib_internal/jailintotempdir.c \
                                lib_internal/matchlist-appendfiles.c \
@@ -78,6 +91,7 @@ lib_internal_libinternal_a_SOURCES = \
                                lib_internal/unify-deunify.c \
                                lib_internal/unify-settime.c \
                                lib_internal/unify-unify.c \
+                               lib_internal/unify-isiunlinkable.c \
                                lib_internal/util-canonify.c \
                                lib_internal/util-exitlikeprocess.c \
                                lib_internal/util-lockfile.c \
@@ -85,7 +99,15 @@ lib_internal_libinternal_a_SOURCES = \
                                $(command_SRCS) \
                                $(filecfg_SRCS)
 
-DIETPROGS +=                   lib_internal/libinternal.a
+lib_internal_libinternal_diet_a_SOURCES =      \
+                               $(lib_internal_libinternal_common_SRCS)
+
+lib_internal_libinternal_glibc_a_SOURCES =     \
+                               $(lib_internal_libinternal_common_SRCS)
+
+lib_internal_libinternal_diet_a_CPPFLAGS =     $(AM_CPPFLAGS) $(LIB_DEBUG_CPPFLAGS)
+lib_internal_libinternal_glibc_a_CPPFLAGS =    $(AM_CPPFLAGS) $(LIB_DEBUG_CPPFLAGS)
 
+DIETPROGS +=                   lib_internal/libinternal-diet.a
 
 include $(top_srcdir)/lib_internal/testsuite/Makefile-files