X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=Ada95%2Fsrc%2FMakefile.in;h=002dc64ceb7ee4b186075a5080f3e1c89e1f5be3;hp=1c70bf90fba25b70356a6a373ea0414f9c4814fe;hb=9776951416d7fb862b9dca1f4c9f8031a5c9059b;hpb=43f75d22e281b6230678008b72621a76696f45ba

diff --git a/Ada95/src/Makefile.in b/Ada95/src/Makefile.in
index 1c70bf90..002dc64c 100644
--- a/Ada95/src/Makefile.in
+++ b/Ada95/src/Makefile.in
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -28,11 +28,12 @@
 #
 #  Author:  Juergen Pfeifer, 1996
 #
-#  $Id: Makefile.in,v 1.51 2010/07/03 22:59:03 tom Exp $
+#  $Id: Makefile.in,v 1.55 2011/03/19 19:02:35 tom Exp $
 #
 .SUFFIXES:
 
 SHELL		= /bin/sh
+VPATH		= @srcdir@
 THIS		= Makefile
 
 MODEL		= ../../@DFT_OBJ_SUBDIR@
@@ -60,7 +61,7 @@ LN_S		= @LN_S@
 CC		= @CC@
 CFLAGS		= @CFLAGS@
 
-CPPFLAGS	= @ACPPFLAGS@ \
+CPPFLAGS	= @ACPPFLAGS@ @CPPFLAGS@ \
 		  -DHAVE_CONFIG_H -I$(srcdir)
 
 CCFLAGS		= $(CPPFLAGS) $(CFLAGS)
@@ -85,11 +86,11 @@ ADAFLAGS        = @ADAFLAGS@ -I. -I$(srcdir)
 LIB_NAME	= AdaCurses
 SONAME		= @ADA_SHAREDLIB@
 
-GNAT_PROJECT	= library.gpr
+GNAT_PROJECT	= $(srcdir)/library.gpr
 
 # build/source are the Ada95 tree
-BUILD_DIR	= @srcdir@/..
-SOURCE_DIR	= @srcdir@/..
+BUILD_DIR	= ..
+SOURCE_DIR	= ..
 
 BUILD_DIR_LIB	= $(BUILD_DIR)/lib
 SOURCE_DIR_SRC	= $(SOURCE_DIR)/src
@@ -97,8 +98,9 @@ SOURCE_DIR_SRC	= $(SOURCE_DIR)/src
 ADAMAKE         = @cf_ada_make@
 ADAMAKEFLAGS    = \
 	-P$(GNAT_PROJECT) \
-	-XBUILD_DIR=$(BUILD_DIR) \
-	-XSOURCE_DIR=$(SOURCE_DIR) \
+	-XBUILD_DIR=`cd $(BUILD_DIR);pwd` \
+	-XSOURCE_DIR=`cd $(SOURCE_DIR);pwd` \
+	-XSOURCE_DIR2=`cd $(srcdir);pwd` \
 	-XLIB_NAME=$(LIB_NAME) \
 	-XSONAME=$(SONAME)
 
@@ -215,11 +217,19 @@ $(ABASE)-trace.adb : $(srcdir)/$(ABASE)-trace.adb_p
 	$(ADAPREP) -DADA_TRACE=@ADA_TRACE@ -DPRAGMA_UNREF=@PRAGMA_UNREF@ $(srcdir)/$(ABASE)-trace.adb_p $@
 
 ###############################################################################
+C_OBJS	= c_varargs_to_ada.o
+
+c_varargs_to_ada.o :	$(srcdir)/c_varargs_to_ada.c
+	$(CC) $(CFLAGS_DEFAULT) -c -o $@ $(srcdir)/c_varargs_to_ada.c
+
+###############################################################################
+
+@USE_OLD_MAKERULES@MIXED_OBJS = $(C_OBJS) $(LIBOBJS) @cf_generic_objects@
 
 @USE_OLD_MAKERULES@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \
 @USE_OLD_MAKERULES@		$(BUILD_DIR_LIB) \
-@USE_OLD_MAKERULES@		$(LIBOBJS) @cf_generic_objects@
-@USE_OLD_MAKERULES@	$(AR) $(ARFLAGS) $@ $(LIBOBJS) @cf_generic_objects@
+@USE_OLD_MAKERULES@		$(MIXED_OBJS)
+@USE_OLD_MAKERULES@	$(AR) $(ARFLAGS) $@ $(MIXED_OBJS)
 
 $(BUILD_DIR)/static-ali : ; mkdir -p $@
 $(BUILD_DIR)/static-obj : ; mkdir -p $@
@@ -231,8 +241,10 @@ STATIC_DIRS = \
 
 @USE_GNAT_PROJECTS@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \
 @USE_GNAT_PROJECTS@		$(ABASE)-trace.adb \
+@USE_GNAT_PROJECTS@		$(C_OBJS) \
 @USE_GNAT_PROJECTS@		$(STATIC_DIRS)
 @USE_GNAT_PROJECTS@	$(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static
+@USE_GNAT_PROJECTS@	$(AR) $(ARFLAGS) $@ $(C_OBJS)
 @USE_GNAT_PROJECTS@
 @USE_GNAT_PROJECTS@install \
 @USE_GNAT_PROJECTS@install.libs :: \
@@ -260,6 +272,7 @@ SHARED_DIRS = \
 @MAKE_ADA_SHAREDLIB@all \
 @MAKE_ADA_SHAREDLIB@$(BUILD_DIR_LIB)/$(SHARED_LIBNAME) :: $(ABASE)-trace.adb $(SHARED_DIRS)
 @MAKE_ADA_SHAREDLIB@	$(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic
+@MAKE_ADA_SHAREDLIB@	$(AR) $(ARFLAGS) $@ $(MIXED_OBJS)
 
 install \
 install.libs :: $(ADA_INCLUDE)