[Linux-decnet-commit] CVS: dnprogs Makefile.common,1.48,1.49

[Christine C. <chr...@us...>]

Update of /cvsroot/linux-decnet/dnprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18963

Modified Files:
	Makefile.common 
Log Message:
Fix up Makefile to be the same as others in the project


Index: Makefile.common
===================================================================
RCS file: /cvsroot/linux-decnet/dnprogs/Makefile.common,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** Makefile.common	3 Sep 2008 15:24:50 -0000	1.48
--- Makefile.common	5 Sep 2008 12:44:34 -0000	1.49
***************
*** 67,70 ****
--- 67,71 ----
  ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
  
+ TOP=..
  #
  # For RPM & DEB builds
***************
*** 118,122 ****
  CC=gcc
  CDEFS+=-D_XOPEN_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
! INCLUDES=-I../libdap -I../include
  CXXFLAGS+=-pipe -fdollars-in-identifiers -fsigned-char -Wall -Wno-unused -Wno-uninitialized $(INCLUDES) -DVERSION=\"$(VERSION)\" $(CDEFS) $(SHADOWDEFS) $(PTSDEFS) $(DFLAGS)
  CFLAGS  +=-pipe -fsigned-char -Wstrict-prototypes -Wall -Wno-unused -Wno-uninitialized $(INCLUDES) -DVERSION=\"$(VERSION)\" $(CDEFS) $(SHADOWDEFS) $(PTSDEFS) $(DFLAGS)
--- 119,123 ----
  CC=gcc
  CDEFS+=-D_XOPEN_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
! INCLUDES=-I$(TOP)/libdap -I$(TOP)/include
  CXXFLAGS+=-pipe -fdollars-in-identifiers -fsigned-char -Wall -Wno-unused -Wno-uninitialized $(INCLUDES) -DVERSION=\"$(VERSION)\" $(CDEFS) $(SHADOWDEFS) $(PTSDEFS) $(DFLAGS)
  CFLAGS  +=-pipe -fsigned-char -Wstrict-prototypes -Wall -Wno-unused -Wno-uninitialized $(INCLUDES) -DVERSION=\"$(VERSION)\" $(CDEFS) $(SHADOWDEFS) $(PTSDEFS) $(DFLAGS)
***************
*** 124,140 ****
  # Conditional for shared/static libs
  ifdef LINKSTATIC
! LIBDNET=../libdnet/libdnet.a
! LIBDAEMON=../libdaemon/libdnet_daemon.a $(LIBCRYPT)
! LIBDAP=../libdap/libdap.a
! DEPLIBDNET=../libdnet/libdnet.a
! DEPLIBDAEMON=../libdaemon/libdnet_daemon.a
! DEPLIBDAP=../libdap/libdap.a
  else
! LIBDNET=-L../libdnet -ldnet
! LIBDAP=-L../libdap -ldap
! LIBDAEMON=-L../libdaemon -ldnet_daemon $(LIBCRYPT)
! DEPLIBDNET=../libdnet/libdnet.so
! DEPLIBDAEMON=../libdaemon/libdnet_daemon.so
! DEPLIBDAP=../libdap/libdap.so
  endif
  
--- 125,141 ----
  # Conditional for shared/static libs
  ifdef LINKSTATIC
! LIBDNET=$(TOP)/libdnet/libdnet.a
! LIBDAEMON=$(TOP)/libdaemon/libdnet_daemon.a $(LIBCRYPT)
! LIBDAP=$(TOP)/libdap/libdap.a
! DEPLIBDNET=$(TOP)/libdnet/libdnet.a
! DEPLIBDAEMON=$(TOP)/libdaemon/libdnet_daemon.a
! DEPLIBDAP=$(TOP)/libdap/libdap.a
  else
! LIBDNET=-L$(TOP)/libdnet -ldnet
! LIBDAP=-L$(TOP)/libdap -ldap
! LIBDAEMON=-L$(TOP)/libdaemon -ldnet_daemon $(LIBCRYPT)
! DEPLIBDNET=$(TOP)/libdnet/libdnet.so
! DEPLIBDAEMON=$(TOP)/libdaemon/libdnet_daemon.so
! DEPLIBDAP=$(TOP)/libdap/libdap.so
  endif