X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=c%2B%2B%2FMakefile.in;h=1efb2691d3e2e513076a9e1ca225bee631facc07;hp=5d864238d9289b6b940bc539617ac6246f522f2c;hb=a28e782d7794ddeec23e7cb212dc455f0d93dc22;hpb=04d942c3d98cf0a929c6afb17be8c10d4ae39af0 diff --git a/c++/Makefile.in b/c++/Makefile.in index 5d864238..1efb2691 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.123 2020/05/24 01:40:20 anonymous.maarten Exp $ +# $Id: Makefile.in,v 1.127 2020/09/05 19:01:14 tom Exp $ ############################################################################## # Copyright 2018,2020 Thomas E. Dickey # # Copyright 1998-2015,2016 Free Software Foundation, Inc. # @@ -97,10 +97,10 @@ ETAGS = @ETAGS@ CC = ${CXX} CCFLAGS = $(CPPFLAGS) $(CXXFLAGS) -CFLAGS_LIBTOOL = $(CCFLAGS) -DNCURSES_STATIC +CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) -DNCURSES_STATIC -CFLAGS_DEBUG = $(CCFLAGS) @CXX_G_OPT@ -DTRACE -CFLAGS_PROFILE = $(CCFLAGS) -pg +CFLAGS_DEBUG = $(CCFLAGS) -DNCURSES_STATIC @CXX_G_OPT@ -DTRACE +CFLAGS_PROFILE = $(CCFLAGS) -DNCURSES_STATIC -pg CFLAGS_SHARED = $(CCFLAGS) @CC_SHARED_OPTS@ CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@) @@ -190,7 +190,7 @@ realclean :: distclean ############################################################################### -HEADER_DEPS = \ +HEADER_DEPS = @INTERNALS_HDR@ \ etip.h \ ../include/curses.h \ ../include/eti.h \ @@ -201,7 +201,6 @@ HEADER_DEPS = \ ../include/ncurses_dll.h \ ../include/panel.h \ ../include/unctrl.h \ - $(INCDIR)/nc_mingw.h \ $(INCDIR)/nc_string.h \ $(srcdir)/cursesp.h \ $(srcdir)/cursesw.h \ @@ -245,7 +244,7 @@ $(MODEL)/demo$o : $(srcdir)/demo.cc \ $(cursesm_h) \ $(cursesapp_h) @echo 'compiling demo (obj_s)' - @$(LIBTOOL_COMPILE) $(CXX) $(CFLAGS_DEFAULT) -c $(srcdir)/demo.cc -o $@ + @cd $(MODEL) && $(LIBTOOL_COMPILE) $(CXX) $(CFLAGS_DEFAULT) -c $(top_srcdir)/c++/demo.cc -o $@ demo$x: $(OBJS_DEMO) \ $(LIBRARIES) \