CVS: linux-atm/src/q2931 Makefile.am,1.1.2.1,1.1.2.2

[chas w. <ch...@us...>]

Update of /cvsroot/linux-atm/linux-atm/src/q2931
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8670

Modified Files:
      Tag: V2_5_1
	Makefile.am 
Log Message:
use the default automake rules to build q.out.o and qd.dump.o; this should
always get the compiler flags right now.

for now, disable building qd.standalone.o; if we need this it can be
fixed at a later date.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/q2931/Attic/Makefile.am,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Makefile.am	3 Aug 2009 20:36:56 -0000	1.1.2.1
--- Makefile.am	5 Aug 2009 15:21:41 -0000	1.1.2.2
***************
*** 1,13 ****
! noinst_PROGRAMS = q.dump
  check_PROGRAMS = q.test
  
- q_dump_SOURCES =
- q_dump_LDADD = qd.dump.standalone.o
- # FIXME: paulsch: We don't really depend on qd.dump.o or q.out.o here, but this
- # trick will get it built with only a minor glitch in the dependency checking
- # for q.dump.
- q_dump_DEPENDENCIES = $(q_dump_LDADD) qd.dump.o q.out.o
- EXTRA_q_dump_SOURCES = op.h uni.h qlib.c qlib.h
- 
  q_test_SOURCES = qtest.c uni.h
  q_test_DEPENDENCIES = q.test.c
--- 1,5 ----
! noinst_PROGRAMS = q.out.o qd.dump.o
  check_PROGRAMS = q.test
  
  q_test_SOURCES = qtest.c uni.h
  q_test_DEPENDENCIES = q.test.c
***************
*** 39,49 ****
  	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) - < $(srcdir)/msg.fmt | ../qgen/qgen -D
  
! q.out.o: q.out.c q.out.h qlib.c qlib.h
! 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(TARGET_CFLAGS) -c q.out.c
  
! qd.dump.o: qd.dump.c qd.out.c qlib.c qlib.h
! 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TARGET_CFLAGS) -c qd.dump.c
  
! qd.dump.standalone.o: qd.dump.c qd.out.c qlib.c qlib.h
! 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) -DSTANDALONE $(INCLUDES) $(CFLAGS) -c qd.dump.c \
! 	-o qd.dump.standalone.o
--- 31,39 ----
  	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) - < $(srcdir)/msg.fmt | ../qgen/qgen -D
  
! q.out.o: q.out.c q.out.h qlib.c qlib.h op.h uni.h
  
! qd.dump.o: qd.dump.c qd.out.c qlib.c qlib.h op.h uni.h
  
! #qd.dump.standalone.o: qd.dump.c qd.out.c qlib.c qlib.h
! #	$(CC) $(DEFS) $(DEFAULT_INCLUDES) -DSTANDALONE $(INCLUDES) $(CFLAGS) -c qd.dump.c \
! #		-o qd.dump.standalone.o