Changeset 10540

Timestamp:

Dec 7, 2006, 3:04:45 PM (19 years ago)

Author:

jhoblitt

Message:

remove the dangerous use of ppStats_CFLAGS & ppStats_LDFLAGS as a) they conflict with the automake/libtoolized names for the ppStats binary and b) they were used for optimization flags only and we don't want other packages to inherit those

Location:

trunk/ppStats

Files:

• configure.ac (modified) (2 diffs)
• ppStats.pc.in (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)

trunk/ppStats/configure.ac

@@ -26 +26 @@
 )
 
-ppStats_CFLAGS="-Wall -Werror -std=c99"
-ppStats_LDFLAGS=""
+dnl ppStats_CFLAGS="-Wall -Werror -std=c99"
+CFLAGS="${CFLAGS=} -Wall -Werror -std=c99"
                                                                                 
-dnl handle debug building
-AC_ARG_ENABLE(optimize,
-  [AS_HELP_STRING(--enable-optimize,enable compiler optimization)],
-  [AC_MSG_RESULT(compile optimization enabled)
-   CFLAGS="${CFLAGS=} -O2"],
-  [AC_MSG_RESULT([compile optimization disabled])
-   CFLAGS="${CFLAGS=} -O0 -g"]
-)
- 
 dnl handle path coverage checking
 AC_ARG_ENABLE(coverage,
@@ -52 +43 @@
   [AS_HELP_STRING(--enable-profile,enable compiler profiler information inclusion)],
   [AC_MSG_RESULT(compile optimization enabled)
-  ppStats_CFLAGS="${ppStats_CFLAGS} -g -pg"
-  ppStats_LDFLAGS="${ppStats_LDFLAGS} -pg -Wl,--start-group -Wl,-Bstatic"]
+  CFLAGS="${CFLAGS=} -g -pg"
+  LDFLAGS="${LDFLAGS=} -pg -Wl,--start-group -Wl,-Bstatic"]
   )
    
-AC_SUBST([ppStats_CFLAGS])
-AC_SUBST([ppStats_LDFLAGS])
-
 AC_CONFIG_FILES([
   Makefile

trunk/ppStats/ppStats.pc.in

@@ -9 +9 @@
 Requires: pslib psmodules
 Libs: -L${libdir} -lppStats
-Libs.private: @ppStats_LDFLAGS@
-Cflags: -I${includedir} @ppStats_CFLAGS@
+Cflags: -I${includedir}

trunk/ppStats/src/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libppStats.la
-libppStats_la_CPPFLAGS = $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) $(ppStats_CFLAGS)
+libppStats_la_CPPFLAGS = $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
 
 bin_PROGRAMS = ppStats
 
-ppStats_CFLAGS += $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
-ppStats_LDFLAGS += $(PSMODULE_LIBS) $(PSLIB_LIBS) -Wl,-Bdynamic
-ppStats_LDADD = libppStats.la
+ppStats_CFLAGS  = $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
+ppStats_LDFLAGS = $(PSMODULE_LIBS) $(PSLIB_LIBS) -Wl,-Bdynamic
+ppStats_LDADD   = libppStats.la
 
 libppStats_la_SOURCES =         \