- OMNotebook now respects LDFLAGS configure flags

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@7265 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Dec 2, 2010 · 8816397 · 8816397
1 parent 10cfb34
commit 8816397
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/OMNotebook/OMNotebookQT4/Makefile.unix.in b/OMNotebook/OMNotebookQT4/Makefile.unix.in
@@ -12,15 +12,15 @@ NAME=OMNotebook
 all: build
 
 Makefile:
-	$(QMAKE)
+	LDFLAGS="$(LDFLAGS)" $(QMAKE)
 
 clean: Makefile
 	rm -rf $(NAME) $(NAME)$(EXE) omc_communication.* Makefile
 
 omc_communication.cc omc_communication.h: $(runtimedir)/omc_communication.idl
 	@IDLCMD@ $<
 
-$(NAME)$(EXE): Makefile omc_communication.cc
+$(NAME)$(EXE): Makefile OMNotebook.config omc_communication.cc
 	$(MAKE) -f Makefile
 ifeq ($(EXE),.app)
 $(NAME): $(NAME)$(EXE) always
@@ -48,3 +48,5 @@ build: $(NAME)
 Makefile.unix: Makefile.unix.in
 	cd $(top_builddir); ./config.status
 
+OMNotebook.config: OMNotebook.config.in
+	cd $(top_builddir); ./config.status
diff --git a/OMNotebook/OMNotebookQT4/OMNotebook.config.in b/OMNotebook/OMNotebookQT4/OMNotebook.config.in
@@ -8,3 +8,4 @@ CORBALIBS = @CORBALIBS@
 CORBAINC = @CORBA_QMAKE_INCLUDES@
 USE_CORBA = @QT_USE_CORBA@
 
+QMAKE_LFLAGS += @LDFLAGS@