[svn-commits] tzafrir: trunk r1033 - /trunk/Makefile

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Wed May  9 14:57:43 2012
New Revision: 1033

URL: http://svnview.digium.com/svn/menuselect?view=rev&rev=1033
Log:
Don't suppress CFLAGS and LDFLAGS

r366002 in Asterisk allows passing CFLAGS and LDFLAGS to menuselect.
This commit is intended to avoid having menuselect override them.

While we're at it, remove '-c' from CFLAGS.

Review: https://reviewboard.asterisk.org/r/1908/


Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/menuselect/trunk/Makefile?view=diff&rev=1033&r1=1032&r2=1033
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed May  9 14:57:43 2012
@@ -22,7 +22,7 @@
 
 # Basic set of sources and flags/libraries/includes
 OBJS:=menuselect.o strcompat.o
-CFLAGS:=-g -c -D_GNU_SOURCE -Wall
+CFLAGS+=-g -D_GNU_SOURCE -Wall
 
 ifeq ($(MENUSELECT_DEBUG),yes)
   CFLAGS += -DMENUSELECT_DEBUG
@@ -64,14 +64,14 @@
 $(OBJS) $(C_OBJS) $(N_OBJS) $(G_OBJS) $(M_OBJS): autoconfig.h menuselect.h
 
 makeopts autoconfig.h: autoconfig.h.in makeopts.in
-	@./configure $(CONFIGURE_SILENT) CC= LD= AR= CFLAGS=
+	@./configure $(CONFIGURE_SILENT)
 
 $(ALL_TGTS): mxml/libmxml.a
 
 ifdef C_OBJS
 menuselect_curses.o: CFLAGS+=$(C_INCLUDE)
 cmenuselect: $(OBJS) $(C_OBJS)
-	$(CC) -o $@ $^ $(C_LIBS)
+	$(CC) $(LDFLAGS) -o $@ $^ $(C_LIBS)
 else
 cmenuselect:
 endif
@@ -79,7 +79,7 @@
 ifdef G_OBJS
 menuselect_gtk.o: CFLAGS+=$(G_INCLUDE)
 gmenuselect: $(OBJS) $(G_OBJS)
-	$(CC) -o $@ $^ $(G_LIBS)
+	$(CC) $(LDFLAGS) -o $@ $^ $(G_LIBS)
 else
 gmenuselect:
 endif
@@ -87,13 +87,13 @@
 ifdef N_OBJS
 menuselect_newt.o: CFLAGS+=$(N_INCLUDE)
 nmenuselect: $(OBJS) $(N_OBJS)
-	$(CC) -o $@ $^ $(N_LIBS)
+	$(CC) $(LDFLAGS) -o $@ $^ $(N_LIBS)
 else
 nmenuselect:
 endif
 
 menuselect: $(OBJS) $(M_OBJS)
-	$(CC) -o $@ $^ $(M_LIBS)
+	$(CC) $(LDFLAGS) -o $@ $^ $(M_LIBS)
 
 mxml/libmxml.a:
 	@if test ! -f mxml/Makefile ; then cd mxml && ./configure ; fi