From 397b5284d6f9ecfbd0147782fc57350930044777 Mon Sep 17 00:00:00 2001 From: kan Date: Mon, 2 Aug 2010 16:01:55 +0000 Subject: [PATCH] Linux build system release --- adm_local/unix/make_conclude.in | 26 +++++++++++++------------- src/GLViewer/GLViewer.pro | 2 ++ src/GLViewer/Makefile.am | 2 ++ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/adm_local/unix/make_conclude.in b/adm_local/unix/make_conclude.in index c8da4fbe3..5443a6eb4 100644 --- a/adm_local/unix/make_conclude.in +++ b/adm_local/unix/make_conclude.in @@ -157,7 +157,7 @@ $(DEST_UI_PY_FILES): $(top_builddir)/bin/salome/%: % PYTHON_SHARED_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules $(PYTHON_SHARED_SITE): - $(INSTALL) -d $@ + $(INSTALL) -p -d $@ DEST_SHAREDPYSCRIPTS = $(EXPORT_SHAREDPYSCRIPTS:%=$(PYTHON_SHARED_SITE)/%) sharedpyscripts: $(PYTHON_SHARED_SITE) $(DEST_SHAREDPYSCRIPTS) @@ -200,13 +200,13 @@ $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%): $( # Make installation directories if they don't exist. $(libdir) $(includedir) $(bindir) $(datadir) $(idldir) $(sharedpydir): - $(INSTALL) -d $@ && chmod 755 $@ + $(INSTALL) -p -d $@ && chmod 755 $@ # Install the library, the public header files, and programs. install: $(LIB) $(BIN) $(TEST_PROGS) $(libdir) $(includedir) $(bindir) $(datadir) $(idldir) install-python install-sharedpyqt install-qm install-res @for f in X $(LIB); do \ if test $$f != X; then \ - ($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1); \ + ($(LT_INSTALL_LIB) -p $$f $(libdir)/. || exit 1); \ fi; \ done @if ! test -z $(LIB_SWIG) ; then \ @@ -214,19 +214,19 @@ install: $(LIB) $(BIN) $(TEST_PROGS) $(libdir) $(includedir) $(bindir) $(datadir fi; @for f in X $(BIN); do \ if test $$f != X; then \ - ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ + ($(LT_INSTALL_PROG) -p $$f $(bindir)/. || exit 1); \ fi; \ done # Install tests programmes in bindir @for f in X $(TEST_PROGS); do \ if test $$f != X; then \ - ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ + ($(LT_INSTALL_PROG) -p $$f $(bindir)/. || exit 1); \ fi; \ done # Install exported includes in includedir @for f in X $(EXPORT_HEADERS:%=$(srcdir)/%); do \ if test $$f != X; then \ - (cp -p -f $$f $(includedir) || exit 1); \ + (cp -p -u -f $$f $(includedir) || exit 1); \ fi; \ done @@ -234,10 +234,10 @@ install: $(LIB) $(BIN) $(TEST_PROGS) $(libdir) $(includedir) $(bindir) $(datadir install-python: $(bindir) $(EXPORT_PYSCRIPTS:%=install-%) $(UI_PY_FILES:%=install-%) $(UI_PY_FILES:%=install-%): install-%: % - $(INSTALL_PROGRAM) $< $(bindir)/. + $(INSTALL_PROGRAM) -p $< $(bindir)/. $(EXPORT_PYSCRIPTS:%=install-%): install-%: % - $(INSTALL_PROGRAM) $< $(bindir)/. + $(INSTALL_PROGRAM) -p $< $(bindir)/. #install-python: $(bindir) $(EXPORT_PYSCRIPTS) # @for f in X $(EXPORT_PYSCRIPTS); do \ @@ -250,24 +250,24 @@ $(EXPORT_PYSCRIPTS:%=install-%): install-%: % install-sharedpyqt: $(sharedpydir) $(EXPORT_SHAREDPYSCRIPTS:%=install-%) $(EXPORT_SHAREDPYSCRIPTS:%=install-%): install-%: % - $(INSTALL_PROGRAM) $< $(sharedpydir)/. + $(INSTALL_PROGRAM) -p $< $(sharedpydir)/. # generic rule to install .qm files : install-qm: resources - $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME) + $(INSTALL) -p -d $(datadir)/resources/$(MODULE_NAME) @for f in X $(TS_FILES:%.ts=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm); do \ if test $$f != X; then \ - ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ + ($(INSTALL_DATA) -p $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ fi; \ done # generic rule to install resources files (png, ini ...): install-res: resources - $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME) + $(INSTALL) -p -d $(datadir)/resources/$(MODULE_NAME) @for f in X $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%); do \ if test $$f != X; then \ - ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ + ($(INSTALL_DATA) -p $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ fi; \ done diff --git a/src/GLViewer/GLViewer.pro b/src/GLViewer/GLViewer.pro index 915c323a1..5f760cb5e 100644 --- a/src/GLViewer/GLViewer.pro +++ b/src/GLViewer/GLViewer.pro @@ -29,6 +29,7 @@ HEADERS += GLViewer_Context.h HEADERS += GLViewer_CoordSystem.h HEADERS += GLViewer_Defs.h HEADERS += GLViewer_Drawer.h +HEADERS += GLViewer_FrameBuffer.h HEADERS += GLViewer_Geom.h HEADERS += GLViewer_Grid.h HEADERS += GLViewer_Group.h @@ -54,6 +55,7 @@ SOURCES += GLViewer_Compass.cxx SOURCES += GLViewer_Context.cxx SOURCES += GLViewer_CoordSystem.cxx SOURCES += GLViewer_Drawer.cxx +SOURCES += GLViewer_FrameBuffer.cxx SOURCES += GLViewer_Geom.cxx SOURCES += GLViewer_Grid.cxx SOURCES += GLViewer_Group.cxx diff --git a/src/GLViewer/Makefile.am b/src/GLViewer/Makefile.am index 003d71047..bca41fdba 100644 --- a/src/GLViewer/Makefile.am +++ b/src/GLViewer/Makefile.am @@ -35,6 +35,7 @@ salomeinclude_HEADERS = \ GLViewer_CoordSystem.h \ GLViewer_Defs.h \ GLViewer_Drawer.h \ + GLViewer_FrameBuffer.h \ GLViewer_Geom.h \ GLViewer_Grid.h \ GLViewer_Group.h \ @@ -60,6 +61,7 @@ dist_libGLViewer_la_SOURCES = \ GLViewer_Compass.cxx \ GLViewer_Context.cxx \ GLViewer_CoordSystem.cxx \ + GLViewer_FrameBuffer.cxx \ GLViewer_Drawer.cxx \ GLViewer_Geom.cxx \ GLViewer_Grid.cxx \ -- 2.39.2