add pkgconfig stuff, always build libfirm_xmalloc separately

[r13649]

diff --git a/MakeTargets b/MakeTargets
index fea561f..62a65c6 100644 (file)
--- a/MakeTargets
+++ b/MakeTargets
@@ -72,6 +72,7 @@ TAGS:
 
 # installation
 install:       $(INCLUDEDIR) $(INCLUDEDIR)/adt install_headers $(LIBDIR) install_libs
+       $(INSTALL) -m u+rwx,a+rx $(addprefix $(topdir)/,libfirm.pc) $(LIBDIR)/pkgconfig
        @echo ================================================
        @echo Don\'t forget to add $(LIBDIR) to LD_LIBRARY_PATH
        @echo Don\'t forget to add /usr/public/libxml2/lib to LD_LIBRARY_PATH

diff --git a/Makefile.in b/Makefile.in
index 856eea4..99a52a4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,8 +25,6 @@ enable_statistics := @enable_statistics@
 enable_external_effects := @enable_external_effects@
 # do we want to use the libcore for debug and ADT support
 enable_libcore := @enable_libcore@
-# do we want to disable xmalloc and friends
-disable_libiberty := @disable_libiberty@
 
 # suck in values for the linking procedure:
 LDFLAGS                        = @LDFLAGS@
@@ -43,11 +41,7 @@ ifeq (@enable_external_effects@,yes)
 build_subdirs += ir/external
 endif
 
-ifeq ($(disable_libiberty),yes)
 build_add_lib := libfirm_xmalloc.a
-else
-build_add_lib :=
-endif
 
 subdirs := $(build_subdirs) ir/config
 

diff --git a/configure.in b/configure.in
index 76f6c55..5629cbb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -134,19 +134,6 @@ if test "$enable_heapanalysis" = "yes"; then
 fi
 AC_SUBST([enable_heapanalysis])
 
-dnl disable linking of libiberty parts (xmalloc, xprintf, obstack, ...)
-dnl ----------------------
-AC_ARG_ENABLE([libiberty],
-[AS_HELP_STRING([--disable-libiberty], [disable own libiberty parts])],
-[enable_libiberty="$enableval"], [enable_libiberty="yes"])
-
-if test "$enable_libiberty"=yes; then
-       disable_libiberty=no
-else
-       disable_libiberty=yes
-fi
-AC_SUBST(disable_libiberty)
-
 dnl enable Firm hooks
 dnl -------------
 AC_ARG_ENABLE([hooks],
@@ -163,7 +150,7 @@ AC_ARG_ENABLE([statistics],
 [AS_HELP_STRING([--enable-statistics], [enable Firm statistics])],
 [enable_statistics="$enableval"], [enable_statistics="no"])
 
-if test "$enable_statistics"=yes; then
+if test "$enable_statistics" = yes; then
   AC_DEFINE([FIRM_STATISTICS], [], [enable statistics code])
 fi
 AC_SUBST([enable_statistics])
@@ -174,7 +161,7 @@ AC_ARG_ENABLE([libcore],
 [AS_HELP_STRING([--disable-libcore], [disable libcore support])],
 [enable_libcore="$enableval"],[enable_libcore="yes"])
 
-if test "$enable_libcore"=yes; then
+if test "$enable_libcore" = yes; then
        AC_MSG_CHECKING([for libcore])
        LIBS="$LIBS -lcore"
        AC_LINK_IFELSE(
@@ -193,7 +180,7 @@ AC_ARG_ENABLE([ilp],
 [AS_HELP_STRING([--enable-ilp], [enable ilp solver])],
 [enable_ilp="$enableval"], [enable_ilp="no"])
 
-if test "$enable_ilpd"=yes; then
+if test "$enable_ilp" = yes; then
   AC_DEFINE([WITH_ILP], [], [compile with ilp solver support])
 fi
 AC_SUBST(enable_ilp)
@@ -204,7 +191,7 @@ AC_ARG_ENABLE([jvm],
 [AS_HELP_STRING([--enable-jvm], [enable to call the jvm])],
 [enable_jvm="$enableval"], [enable_jvm="no"])
 
-if test "$enable_jvm"=yes; then
+if test "$enable_jvm" = yes; then
   AC_DEFINE([WITH_JVM], [], [compile with jvm support])
 fi
 AC_SUBST(enable_jvm)
@@ -215,7 +202,7 @@ AC_ARG_ENABLE([wchar_support],
 [AS_HELP_STRING([--enable-wchar-support], [enable wchar_t support for identifiers (needed for java)])],
 [enable_wchar_support="$enableval"], [enable_wchar_support="no"])
 
-if test "$enable_wchar_support"=yes; then
+if test "$enable_wchar_support" = yes; then
   AC_DEFINE([FIRM_ENABLE_WCHAR], [], [enable wchar_t support for identifiers])
 fi
 AC_SUBST([enable_wchar_support])
@@ -437,6 +424,7 @@ AC_CONFIG_FILES([
        firmjni/Makefile
        firmjni/testprograms/Makefile
        libfirm.doxygen
+       libfirm.pc
 ])
 AC_CONFIG_COMMANDS([stamp-h], [touch stamp-h])
 dnl snip the lower part of config.h and put it to ir/config/firm_config.h
@@ -457,6 +445,7 @@ echo "     ilp                   $enable_ilp"
 echo "     jvm                   $enable_jvm"
 echo "     wide char support     $enable_wchar_support"
 echo "     external effects xml  $enable_external_effects"
+echo "     plugins               $plugin_subdirs"
 echo ""
 
 dnl FIXME: this is bad

diff --git a/ir/adt/Makefile.in b/ir/adt/Makefile.in
index 9616454..b4d8f5b 100644 (file)
--- a/ir/adt/Makefile.in
+++ b/ir/adt/Makefile.in
@@ -14,7 +14,6 @@ top_srcdir := @top_srcdir@
 srcdir = @srcdir@
 topdir = ../..
 subdir := ir/adt
-disable_libiberty := @disable_libiberty@
 
 INSTALL_HEADERS_ADT = \
        align.h \
@@ -66,15 +65,10 @@ SOURCES = \
        pset_new.c \
        set.c
 
-ifeq ($(disable_libiberty),no)
-SOURCES += xmalloc.c
-ADDLIB =
-else
 ADDLIB = xmalloc.o
 
 xmalloc.o: xmalloc.c
        $(COMPILE.c) -o $@ $<
-endif
 
 include $(topdir)/MakeRules
 

diff --git a/libfirm.pc.in b/libfirm.pc.in
new file mode 100644 (file)
index 0000000..cd4077e
--- /dev/null
+++ b/libfirm.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libfirm
+Description: library implementing the intermediate representation FIRM
+Version: @VERSION@
+Requires: libcore
+Libs: -L${libdir} -lfirm -lm
+Cflags: -I${includedir}