Changeset 34089 for trunk/pstamp

Timestamp:

Jun 26, 2012, 11:47:13 AM (14 years ago)

Author:

eugene

Message:

changes to support pedantic gcc warnings; add configure option for debug-build and no-as-needed

Location:

trunk/pstamp

Files:

• configure.ac (modified) (2 diffs)
• scripts (modified) (1 prop)
• src/Makefile.am (modified) (1 diff)
• src/pstamprequest.c (modified) (2 diffs)

trunk/pstamp/configure.ac

@@ -10 +10 @@
 AM_MAINTAINER_MODE
 
-IPP_STDCFLAGS
+IPP_STDLDFLAGS
 
 AC_LANG(C)
@@ -30 +30 @@
 PKG_CHECK_MODULES([PSMODULE], [psmodules >= 1.0.0])
 
+OHANA_CONFIG=`which ohana-config`
+
+dnl get CFLAGS for ohana
+AC_MSG_NOTICE([libohana cflags info supplied by ohana-config])
+AC_MSG_CHECKING([libohana cflags])
+OHANA_CFLAGS="`${OHANA_CONFIG} --cflags`"
+AC_MSG_RESULT([${OHANA_CFLAGS}])
+
+dnl get LDFLAGS for ohana
+AC_MSG_NOTICE([libohana ldflags info supplied by ohana-config])
+AC_MSG_CHECKING([libohana ldflags])
+OHANA_LIBS="`${OHANA_CONFIG} --libs`"
+AC_MSG_RESULT([${OHANA_LIBS}])
+
 dnl Set CFLAGS for build
 IPP_STDOPTS
-CFLAGS="${CFLAGS} -Wall -Werror"
-PPSTAMP_CFLAGS="${PSLIB_CFLAGS=} ${PSMODULES_CFLAGS=}"
-PPSTAMP_LIBS="${PSLIB_LIBS=} ${PSMODULES_LIBS=}"
+IPP_STDCFLAGS
+
+PPSTAMP_CFLAGS="${PSLIB_CFLAGS=} ${PSMODULE_CFLAGS=} ${OHANA_CFLAGS}"
+PPSTAMP_LIBS="${PSLIB_LIBS=} ${PSMODULE_LIBS=} ${OHANA_LIBS}"
 echo "PPSTAMP_CFLAGS: $PPSTAMP_CFLAGS"
 echo "PPSTAMP_LIBS: $PPSTAMP_LIBS"

trunk/pstamp/src/Makefile.am

@@ -9 +9 @@
         pstampErrorCodes.h
 
-ppstamp_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) 
-pstamprequest_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) 
-pstampdump_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS)
+ppstamp_CPPFLAGS = $(PPSTAMP_CFLAGS)
+pstamprequest_CPPFLAGS = $(PPSTAMP_CFLAGS)
+pstampdump_CPPFLAGS = $(PPSTAMP_CFLAGS)
 
-ppstamp_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) 
-pstamprequest_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) 
-pstampdump_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS)
+ppstamp_LDFLAGS = $(PPSTAMP_LIBS)
+pstamprequest_LDFLAGS = $(PPSTAMP_LIBS)
+pstampdump_LDFLAGS = $(PPSTAMP_LIBS)
 
 ppstamp_SOURCES = \

trunk/pstamp/src/pstamprequest.c

@@ -191 +191 @@
     bool        gotRange  = false;
     bool        needROI   = false;
-    bool        makeStamps= false;
+    // bool        makeStamps= false; XXX unused
     unsigned    optionMask = PSTAMP_SELECT_IMAGE;
 
@@ -212 +212 @@
         psMetadataAddStr (md, PS_LIST_TAIL, "JOB_TYPE", PS_META_REPLACE, "", "stamp");
         needROI = true;
-        makeStamps = true;
+        // XXX unused makeStamps = true;
     }