(file) Return to Makefile CVS log (file) Jump to this file's LXR Page (dir) Up to [CENS] / emstar

Diff for /emstar/Makefile between version 1.54 and 1.55

version 1.54, 2005/10/27 00:39:46 version 1.55, 2005/10/27 01:28:14
Line 127 
Line 127 
 endif endif
  
 CFLAGS  += -Wall -Werror -I. $(GLIB_CFLAGS) -I$(INCDIR) -DCVSTAG=\"$(CVSTAG)\" CFLAGS  += -Wall -Werror -I. $(GLIB_CFLAGS) -I$(INCDIR) -DCVSTAG=\"$(CVSTAG)\"
   # add no-pointer-sign if we have gcc >=4
 ifdef HAVE_GCC_4 ifdef HAVE_GCC_4
 CFLAGS += -Wno-pointer-sign  CFLAGS += -Wno-pointer-sign -D__HAVE_GCC_4
 endif endif
 KCFLAGS += -DCVSTAG=\"$(CVSTAG)\" KCFLAGS += -DCVSTAG=\"$(CVSTAG)\"
 CXXFLAGS += -Wall -Werror -I. $(GLIB_CFLAGS) -I$(INCDIR) -DCVSTAG=\"$(CVSTAG)\" CXXFLAGS += -Wall -Werror -I. $(GLIB_CFLAGS) -I$(INCDIR) -DCVSTAG=\"$(CVSTAG)\"
Line 152 
Line 153 
 export EMTOS_MAKE_CC = $(CC) export EMTOS_MAKE_CC = $(CC)
 export EMTOS_MAKE_GCCINCLUDE export EMTOS_MAKE_GCCINCLUDE
 export GLIB_CFLAGS export GLIB_CFLAGS
   # export this if we have gcc_4 so we can include the right thing
   # on the emtos build
   ifdef HAVE_GCC_4
   export HAVE_GCC_4
   endif
 # set up the default location for the cross-compiled glib library # set up the default location for the cross-compiled glib library
 ifndef EMTOS_MAKE_LDFLAGS ifndef EMTOS_MAKE_LDFLAGS
   EMTOS_MAKE_LDFLAGS = $(PWD)/$(GLIB_PATH)   EMTOS_MAKE_LDFLAGS = $(PWD)/$(GLIB_PATH)

Legend:
Removed from v.1.54  
changed lines
  Added in v.1.55
CENS CVS Mailing List
 Powered by
ViewCVS 0.9.2