added new m4/*.m4 macros
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Tue, 21 Oct 2003 13:40:31 +0000 (13:40 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Tue, 21 Oct 2003 13:40:31 +0000 (13:40 +0000)
added conditional build of CXX files
added support for libtool

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

util-vserver/Makefile.am

index 4d1da25..36284df 100644 (file)
@@ -30,6 +30,7 @@ include_HEADERS               =  $(lib_HDRS)
 noinst_HEADERS         =  $(src_HDRS) $(lib_XHDRS) compat.h
 
 lib_LIBRARIES          =  $(lib_lib_LIBS)
+#lib_LTLIBRARIES               =  $(lib_lib_LTLIBS)
 
 pkglib_SCRIPTS         =  $(scripts_SCRPTS)
 pkglib_DATA            =  $(scriptscfg_DATA) $(scripts_DTA)
@@ -48,16 +49,17 @@ BUILT_SOURCES               =  linuxcaps.h pathconfig.h linuxvirtual.h
 
 man_MANS               =  $(man_DATMAN)
 
+EXTRA_PROGRAMS         =  $(src_EXTRA_PROGS)
 EXTRA_DIST             =  $(sysv_XTRAS) $(sysv_CFG) \
                            $(doc_DAT) $(man_DATMAN) \
                           $(scripts_SCRPTS) $(scripts_PRGS) $(scripts_XTRAS) \
                           pathconfig.h.pathsubst \
                           util-vserver.spec \
-                           m4/ensc_cflags.m4 \
+                           m4/ensc_cflags.m4 m4/ensc_fpicsyscall.m4 \
+                          m4/ensc_cxxcompiler.m4 \
                           THANKS
 
 AM_CPPFLAGS            =  -I $(top_srcdir)/lib -D _GNU_SOURCE
-AM_CFLAGS              =  -Wall -pedantic
 
 CLEANFILES             =  $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) $(BUILT_SOURCES) \
                           .*.pathsubst.stamp */.*.pathsubst.stamp \
@@ -119,6 +121,8 @@ install-data-local:
                        $(INSTALL) -d -m755 $(DESTDIR)$(pkgstatedir)
 
 if USE_DIETLIBC
+$(DIETPROGS):          LIBTOOL=$(LIBTOOL) --tag CC
+
 $(addsuffix $(EXEEXT), $(DIETPROGS)) \
 $(addsuffix $(OBJEXT), $(DIETPROGS)) \
                :               CC=$(DIET_CC)