From 0511e22c9eff9b5f75c5bb57f5592816ac390171 Mon Sep 17 00:00:00 2001
From: jjako <jjako>
Date: Tue, 28 Jan 2003 16:11:07 +0000
Subject: [PATCH] Make without first installing gtplib

---
 ggsn/Makefile.am    |  2 +-
 ggsn/Makefile.in    | 25 ++++++++++++++++++-------
 sgsnemu/Makefile.am |  2 +-
 sgsnemu/Makefile.in | 25 ++++++++++++++++++-------
 4 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am
index b72006e..8b84aea 100644
--- a/ggsn/Makefile.am
+++ b/ggsn/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = ggsn
 
 LDFLAGS = -Wl,--rpath -Wl,/usr/local/lib
 
-CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -lgtp
+CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -lgtp -L../gtp
 
 ggsn_SOURCES = ggsn.c tun.c tun.h cmdline.c cmdline.h
 
diff --git a/ggsn/Makefile.in b/ggsn/Makefile.in
index 9c1eab5..12c4b44 100644
--- a/ggsn/Makefile.in
+++ b/ggsn/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -63,30 +63,35 @@ AS = @AS@
 AWK = @AWK@
 CC = @CC@
 DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+EXEEXT = @EXEEXT@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+STRIP = @STRIP@
 VERSION = @VERSION@
 
 bin_PROGRAMS = ggsn
 
 LDFLAGS = -Wl,--rpath -Wl,/usr/local/lib
 
-CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -lgtp
+CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -lgtp -L../gtp
 
 ggsn_SOURCES = ggsn.c tun.c tun.h cmdline.c cmdline.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
+bin_PROGRAMS =  ggsn$(EXEEXT)
 PROGRAMS =  $(bin_PROGRAMS)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-ggsn_OBJECTS =  ggsn.o tun.o cmdline.o
+ggsn_OBJECTS =  ggsn.$(OBJEXT) tun.$(OBJEXT) cmdline.$(OBJEXT)
 ggsn_LDADD = $(LDADD)
 ggsn_DEPENDENCIES = 
 ggsn_LDFLAGS = 
@@ -107,7 +112,7 @@ OBJECTS = $(ggsn_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .lo .o .s
+.SUFFIXES: .S .c .lo .o .obj .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu ggsn/Makefile
 
@@ -141,6 +146,11 @@ uninstall-binPROGRAMS:
 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	done
 
+# FIXME: We should only use cygpath when building on Windows,
+# and only if it is available.
+.c.obj:
+	$(COMPILE) -c `cygpath -w $<`
+
 .s.o:
 	$(COMPILE) -c $<
 
@@ -149,6 +159,7 @@ uninstall-binPROGRAMS:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
+	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -173,8 +184,8 @@ distclean-libtool:
 
 maintainer-clean-libtool:
 
-ggsn: $(ggsn_OBJECTS) $(ggsn_DEPENDENCIES)
-	@rm -f ggsn
+ggsn$(EXEEXT): $(ggsn_OBJECTS) $(ggsn_DEPENDENCIES)
+	@rm -f ggsn$(EXEEXT)
 	$(LINK) $(ggsn_LDFLAGS) $(ggsn_OBJECTS) $(ggsn_LDADD) $(LIBS)
 
 tags: TAGS
diff --git a/sgsnemu/Makefile.am b/sgsnemu/Makefile.am
index ba6fabf..49b4588 100644
--- a/sgsnemu/Makefile.am
+++ b/sgsnemu/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = sgsnemu
 
 LDFLAGS = -Wl,--rpath -Wl,/usr/local/lib
 
-CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -lgtp
+CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -lgtp -L../gtp
 
 sgsnemu_SOURCES = sgsnemu.c tun.c tun.h cmdline.c cmdline.h
 
diff --git a/sgsnemu/Makefile.in b/sgsnemu/Makefile.in
index d5d3d9e..3299b4f 100644
--- a/sgsnemu/Makefile.in
+++ b/sgsnemu/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -63,30 +63,35 @@ AS = @AS@
 AWK = @AWK@
 CC = @CC@
 DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+EXEEXT = @EXEEXT@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+STRIP = @STRIP@
 VERSION = @VERSION@
 
 bin_PROGRAMS = sgsnemu
 
 LDFLAGS = -Wl,--rpath -Wl,/usr/local/lib
 
-CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -lgtp
+CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -lgtp -L../gtp
 
 sgsnemu_SOURCES = sgsnemu.c tun.c tun.h cmdline.c cmdline.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
+bin_PROGRAMS =  sgsnemu$(EXEEXT)
 PROGRAMS =  $(bin_PROGRAMS)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-sgsnemu_OBJECTS =  sgsnemu.o tun.o cmdline.o
+sgsnemu_OBJECTS =  sgsnemu.$(OBJEXT) tun.$(OBJEXT) cmdline.$(OBJEXT)
 sgsnemu_LDADD = $(LDADD)
 sgsnemu_DEPENDENCIES = 
 sgsnemu_LDFLAGS = 
@@ -107,7 +112,7 @@ OBJECTS = $(sgsnemu_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .lo .o .s
+.SUFFIXES: .S .c .lo .o .obj .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu sgsnemu/Makefile
 
@@ -141,6 +146,11 @@ uninstall-binPROGRAMS:
 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	done
 
+# FIXME: We should only use cygpath when building on Windows,
+# and only if it is available.
+.c.obj:
+	$(COMPILE) -c `cygpath -w $<`
+
 .s.o:
 	$(COMPILE) -c $<
 
@@ -149,6 +159,7 @@ uninstall-binPROGRAMS:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
+	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -173,8 +184,8 @@ distclean-libtool:
 
 maintainer-clean-libtool:
 
-sgsnemu: $(sgsnemu_OBJECTS) $(sgsnemu_DEPENDENCIES)
-	@rm -f sgsnemu
+sgsnemu$(EXEEXT): $(sgsnemu_OBJECTS) $(sgsnemu_DEPENDENCIES)
+	@rm -f sgsnemu$(EXEEXT)
 	$(LINK) $(sgsnemu_LDFLAGS) $(sgsnemu_OBJECTS) $(sgsnemu_LDADD) $(LIBS)
 
 tags: TAGS