replaced several includes by including just firm_types.h

[libfirm] / ir / common / firm.c

diff --git a/ir/common/firm.c b/ir/common/firm.c
index a07da94..9dec9cf 100644 (file)
--- a/ir/common/firm.c
+++ b/ir/common/firm.c
@@ -22,7 +22,6 @@
 
 #ifdef WITH_LIBCORE
 # include <libcore/lc_opts.h>
-# include <libcore/lc_init.h>
 #endif
 
 #include "ident_t.h"
@@ -50,14 +49,18 @@
 
 #ifdef WITH_LIBCORE
 /* returns the firm root */
-lc_opt_entry_t *firm_opt_get_root(void)
-{
+lc_opt_entry_t *firm_opt_get_root(void) {
        static lc_opt_entry_t *grp = NULL;
        if(!grp)
                grp = lc_opt_get_grp(lc_opt_root_grp(), "firm");
        return grp;
 }
-#endif
+
+void firm_init_options(const char *arg_prefix, int argc, const char **argv) {
+  /* parse any init files for firm */
+  lc_opts_init("firm", firm_opt_get_root(), arg_prefix, argc, argv);
+}
+#endif /* WITH_LIBCORE */
 
 void
 init_firm(const firm_parameter_t *param)
@@ -78,8 +81,8 @@ init_firm(const firm_parameter_t *param)
     memcpy(&def_params, param, size);
   }
 
-       /* initialize firm flags */
-       firm_init_flags();
+  /* initialize firm flags */
+  firm_init_flags();
   /* initialize all ident stuff */
   init_ident(def_params.id_if, 1024);
   /* initialize Firm hooks */
@@ -126,15 +129,10 @@ init_firm(const firm_parameter_t *param)
 
   firm_archops_init(def_params.arch_op_settings);
 
-#ifndef NDEBUG
+#ifdef DEBUG_libfirm
   /* integrated debugger extension */
   firm_init_debugger();
 #endif
-
-#ifdef WITH_LIBCORE
-  /* parse any init files for firm */
-  lc_init("firm", firm_opt_get_root(), def_params.arg_prefix, def_params.argc, def_params.argv);
-#endif
 }
 
 void free_firm(void) {