Changeset 34077

Timestamp:

Jun 26, 2012, 10:23:40 AM (14 years ago)

Author:

eugene

Message:

remove Wall Werror entries from specific Makefile (these are supplied at the top-level); move DVO_IMAGE_NAME_LEN to libautocode

Location:

branches/eam_branches/ipp-20120601/Ohana

Files:

• configure.tcsh (modified) (2 diffs)
• src/addstar/Makefile (modified) (1 diff)
• src/addstar/src/LoadData.c (modified) (1 diff)
• src/addstar/src/ReadStarsSDSS.c (modified) (1 diff)
• src/addstar/src/sky_tessalation.c (modified) (1 diff)
• src/getstar/src/ReadImageFiles.c (modified) (1 diff)
• src/libautocode/def/common.h (modified) (1 diff)
• src/libfits/Makefile (modified) (1 diff)
• src/opihi/pcontrol/Makefile (modified) (1 diff)

branches/eam_branches/ipp-20120601/Ohana/configure.tcsh

@@ -62 +62 @@
   case --enable-debug-build
    set debug_build = 1
+   set pedantic = 0
+   echo "disabling pedantic build"
+   endif    
    breaksw;
   # options used by Ohana, but not gpcsw
@@ -87 +90 @@
   case --pedantic
    set pedantic = 1
+   if ($debug_build) then
+    echo "--pedantic and --enable-debug-build are mutually exclusive"
+    exit 2;
+   endif    
    breaksw;
   case --no-pedantic

branches/eam_branches/ipp-20120601/Ohana/src/addstar/Makefile

@@ -13 +13 @@
 
 # programs may add their own internal requirements here
-FULL_CFLAGS   = $(BASE_CFLAGS) -Wall -Werror
+FULL_CFLAGS   = $(BASE_CFLAGS)
 FULL_CPPFLAGS = $(BASE_CPPFLAGS)
 FULL_LDFLAGS  = -lkapa -ldvo -lFITS -lohana $(BASE_LDFLAGS)

branches/eam_branches/ipp-20120601/Ohana/src/addstar/src/LoadData.c

@@ -1 +1 @@
 # include "addstar.h"
-# define DVO_IMAGE_NAME_LEN 128
 
 // XXX this function is somewhat specific to the elixir format output files 

branches/eam_branches/ipp-20120601/Ohana/src/addstar/src/ReadStarsSDSS.c

@@ -1 +1 @@
 # include "addstar.h"
-# define DVO_IMAGE_NAME_LEN 128
+
 int SetSDSSFlags (Stars *star, unsigned int flags1, unsigned int flags2);
 

branches/eam_branches/ipp-20120601/Ohana/src/addstar/src/sky_tessalation.c

@@ -2 +2 @@
 # include "assert.h"
 # define iSWAP(X,Y) {int tmp=(X); (X) = (Y); (Y) = tmp;}
-# define DVO_IMAGE_NAME_LEN 128
 
 // we use a static refcoords structure to avoid multiple alloc / init steps

branches/eam_branches/ipp-20120601/Ohana/src/getstar/src/ReadImageFiles.c

@@ -1 +1 @@
 # include "dvoImageOverlaps.h"
-# define DVO_IMAGE_NAME_LEN 128
 
 Image *ReadImageFiles (char *filename, off_t *Nimages) {

branches/eam_branches/ipp-20120601/Ohana/src/libautocode/def/common.h

@@ -32 +32 @@
 # define rawshort short
 
+# define DVO_IMAGE_NAME_LEN 128
+
 /*** rawshort is used to handle the broken pre-autocode photreg tables
      fix the tables and remove this

branches/eam_branches/ipp-20120601/Ohana/src/libfits/Makefile

@@ -16 +16 @@
 
 # programs may add their own internal requirements here
-FULL_CFLAGS   = $(BASE_CFLAGS) -fPIC -Wall -Werror
+FULL_CFLAGS   = $(BASE_CFLAGS) -fPIC
 FULL_CPPFLAGS = $(BASE_CPPFLAGS) -I$(EXT)
 FULL_LDFLAGS  = $(BASE_LDFLAGS) -lohana

branches/eam_branches/ipp-20120601/Ohana/src/opihi/pcontrol/Makefile

@@ -13 +13 @@
 LIBS1         = -lkapa -lFITS -lohana
 LIBS2         = -lbasiccmd -lshell -ldata 
-FULL_CFLAGS   = $(BASE_CFLAGS) -Wall -Werror
+FULL_CFLAGS   = $(BASE_CFLAGS)
 FULL_CPPFLAGS = $(BASE_CPPFLAGS)
 FULL_LDFLAGS  = $(LIBS1) $(LIBS2) $(BASE_LDFLAGS)