Changeset fc268a0 in mmcs for Makefile

Timestamp:

Sep 18, 2015, 3:35:09 PM (9 years ago)

Author:

rboet <rboet@…>

Branches:

master, matrices

Children:

814c04d

Parents:

96b0c4a

Message:

Incorporacion de opcion nuevo proyecto y modelo de precios homogeneos clasico

File:

• Makefile (modified) (16 diffs)

Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: SMSAM
-# Generated by qmake (2.01a) (Qt 4.8.2) on: Fri Sep 11 10:37:10 2015
+# Generated by qmake (2.01a) (Qt 4.8.2) on: Fri Sep 18 09:48:22 2015
 # Project:  SMSAM.pro
 # Template: app
@@ -58 +58 @@
                 encadenamientoswidget.cpp \
                 formcompararresultados.cpp \
-                formcompararmnc.cpp moc_mainwindow.cpp \
+                formcompararmnc.cpp \
+                formincidenciai.cpp moc_mainwindow.cpp \
                 moc_formloadmatrix.cpp \
                 moc_formviewmatrix.cpp \
@@ -71 +72 @@
                 moc_encadenamientoswidget.cpp \
                 moc_formcompararresultados.cpp \
-                moc_formcompararmnc.cpp
+                moc_formcompararmnc.cpp \
+                moc_formincidenciai.cpp
 OBJECTS       = mainwindow.o \
                 main.o \
@@ -87 +89 @@
                 formcompararresultados.o \
                 formcompararmnc.o \
+                formincidenciai.o \
                 moc_mainwindow.o \
                 moc_formloadmatrix.o \
@@ -100 +103 @@
                 moc_encadenamientoswidget.o \
                 moc_formcompararresultados.o \
-                moc_formcompararmnc.o
+                moc_formcompararmnc.o \
+                moc_formincidenciai.o
 DIST          = /usr/share/qt4/mkspecs/common/unix.conf \
                 /usr/share/qt4/mkspecs/common/linux.conf \
@@ -154 +158 @@
 all: Makefile $(TARGET)
 
-$(TARGET): ui_formLoadMatrix.h ui_formMatrixView.h ui_formvariablesexogenas.h ui_formexportmatrix.h ui_formencadenamientos.h ui_formcompararresultados.h ui_formcompararmnc.h $(OBJECTS)  
+$(TARGET): ui_formLoadMatrix.h ui_formMatrixView.h ui_formvariablesexogenas.h ui_formexportmatrix.h ui_formencadenamientos.h ui_formcompararresultados.h ui_formcompararmnc.h ui_formincidenciai.h $(OBJECTS)  
         $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
@@ -215 +219 @@
 dist: 
         @$(CHK_DIR_EXISTS) .tmp/SMSAM1.0.0 || $(MKDIR) .tmp/SMSAM1.0.0 
-        $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/SMSAM1.0.0/ && $(COPY_FILE) --parents mainwindow.H formloadmatrix.H formviewmatrix.H stackwidget.H accountwidget.H formvariablesexogenas.h stackvariablesexogenas.h variableexogenawidget.h formexportmatrix.h formencadenamientos.h stackencadenamientos.h encadenamientoswidget.h formcompararresultados.h formcompararmnc.h .tmp/SMSAM1.0.0/ && $(COPY_FILE) --parents mainwindow.C main.C formloadmatrix.C formviewmatrix.C stackwidget.C accountwidget.C formvariablesexogenas.cpp stackvariablesexogenas.cpp variableexogenawidget.cpp formexportmatrix.cpp formencadenamientos.cpp stackencadenamientos.cpp encadenamientoswidget.cpp formcompararresultados.cpp formcompararmnc.cpp .tmp/SMSAM1.0.0/ && $(COPY_FILE) --parents formLoadMatrix.ui formMatrixView.ui formvariablesexogenas.ui formexportmatrix.ui formencadenamientos.ui formcompararresultados.ui formcompararmnc.ui .tmp/SMSAM1.0.0/ && (cd `dirname .tmp/SMSAM1.0.0` && $(TAR) SMSAM1.0.0.tar SMSAM1.0.0 && $(COMPRESS) SMSAM1.0.0.tar) && $(MOVE) `dirname .tmp/SMSAM1.0.0`/SMSAM1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/SMSAM1.0.0
+        $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/SMSAM1.0.0/ && $(COPY_FILE) --parents mainwindow.H formloadmatrix.H formviewmatrix.H stackwidget.H accountwidget.H formvariablesexogenas.h stackvariablesexogenas.h variableexogenawidget.h formexportmatrix.h formencadenamientos.h stackencadenamientos.h encadenamientoswidget.h formcompararresultados.h formcompararmnc.h formincidenciai.h .tmp/SMSAM1.0.0/ && $(COPY_FILE) --parents mainwindow.C main.C formloadmatrix.C formviewmatrix.C stackwidget.C accountwidget.C formvariablesexogenas.cpp stackvariablesexogenas.cpp variableexogenawidget.cpp formexportmatrix.cpp formencadenamientos.cpp stackencadenamientos.cpp encadenamientoswidget.cpp formcompararresultados.cpp formcompararmnc.cpp formincidenciai.cpp .tmp/SMSAM1.0.0/ && $(COPY_FILE) --parents formLoadMatrix.ui formMatrixView.ui formvariablesexogenas.ui formexportmatrix.ui formencadenamientos.ui formcompararresultados.ui formcompararmnc.ui formincidenciai.ui .tmp/SMSAM1.0.0/ && (cd `dirname .tmp/SMSAM1.0.0` && $(TAR) SMSAM1.0.0.tar SMSAM1.0.0 && $(COMPRESS) SMSAM1.0.0.tar) && $(MOVE) `dirname .tmp/SMSAM1.0.0`/SMSAM1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/SMSAM1.0.0
 
 
@@ -236 +240 @@
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all: moc_mainwindow.cpp moc_formloadmatrix.cpp moc_formviewmatrix.cpp moc_stackwidget.cpp moc_accountwidget.cpp moc_formvariablesexogenas.cpp moc_stackvariablesexogenas.cpp moc_variableexogenawidget.cpp moc_formexportmatrix.cpp moc_formencadenamientos.cpp moc_stackencadenamientos.cpp moc_encadenamientoswidget.cpp moc_formcompararresultados.cpp moc_formcompararmnc.cpp
+compiler_moc_header_make_all: moc_mainwindow.cpp moc_formloadmatrix.cpp moc_formviewmatrix.cpp moc_stackwidget.cpp moc_accountwidget.cpp moc_formvariablesexogenas.cpp moc_stackvariablesexogenas.cpp moc_variableexogenawidget.cpp moc_formexportmatrix.cpp moc_formencadenamientos.cpp moc_stackencadenamientos.cpp moc_encadenamientoswidget.cpp moc_formcompararresultados.cpp moc_formcompararmnc.cpp moc_formincidenciai.cpp
 compiler_moc_header_clean:
-        -$(DEL_FILE) moc_mainwindow.cpp moc_formloadmatrix.cpp moc_formviewmatrix.cpp moc_stackwidget.cpp moc_accountwidget.cpp moc_formvariablesexogenas.cpp moc_stackvariablesexogenas.cpp moc_variableexogenawidget.cpp moc_formexportmatrix.cpp moc_formencadenamientos.cpp moc_stackencadenamientos.cpp moc_encadenamientoswidget.cpp moc_formcompararresultados.cpp moc_formcompararmnc.cpp
+        -$(DEL_FILE) moc_mainwindow.cpp moc_formloadmatrix.cpp moc_formviewmatrix.cpp moc_stackwidget.cpp moc_accountwidget.cpp moc_formvariablesexogenas.cpp moc_stackvariablesexogenas.cpp moc_variableexogenawidget.cpp moc_formexportmatrix.cpp moc_formencadenamientos.cpp moc_stackencadenamientos.cpp moc_encadenamientoswidget.cpp moc_formcompararresultados.cpp moc_formcompararmnc.cpp moc_formincidenciai.cpp
 moc_mainwindow.cpp: formloadmatrix.H \
                 ui_formLoadMatrix.h \
@@ -250 +254 @@
                 ui_formcompararmnc.h \
                 formcompararmnc.h \
+                ui_formincidenciai.h \
+                formincidenciai.h \
                 stackwidget.H \
                 accountwidget.H \
@@ -303 +309 @@
         /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) formcompararmnc.h -o moc_formcompararmnc.cpp
 
+moc_formincidenciai.cpp: formincidenciai.h
+        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) formincidenciai.h -o moc_formincidenciai.cpp
+
 compiler_rcc_make_all:
 compiler_rcc_clean:
@@ -310 +319 @@
 compiler_moc_source_make_all:
 compiler_moc_source_clean:
-compiler_uic_make_all: ui_formLoadMatrix.h ui_formMatrixView.h ui_formvariablesexogenas.h ui_formexportmatrix.h ui_formencadenamientos.h ui_formcompararresultados.h ui_formcompararmnc.h
+compiler_uic_make_all: ui_formLoadMatrix.h ui_formMatrixView.h ui_formvariablesexogenas.h ui_formexportmatrix.h ui_formencadenamientos.h ui_formcompararresultados.h ui_formcompararmnc.h ui_formincidenciai.h
 compiler_uic_clean:
-        -$(DEL_FILE) ui_formLoadMatrix.h ui_formMatrixView.h ui_formvariablesexogenas.h ui_formexportmatrix.h ui_formencadenamientos.h ui_formcompararresultados.h ui_formcompararmnc.h
+        -$(DEL_FILE) ui_formLoadMatrix.h ui_formMatrixView.h ui_formvariablesexogenas.h ui_formexportmatrix.h ui_formencadenamientos.h ui_formcompararresultados.h ui_formcompararmnc.h ui_formincidenciai.h
 ui_formLoadMatrix.h: formLoadMatrix.ui
         /usr/bin/uic-qt4 formLoadMatrix.ui -o ui_formLoadMatrix.h
@@ -333 +342 @@
 ui_formcompararmnc.h: formcompararmnc.ui
         /usr/bin/uic-qt4 formcompararmnc.ui -o ui_formcompararmnc.h
+
+ui_formincidenciai.h: formincidenciai.ui
+        /usr/bin/uic-qt4 formincidenciai.ui -o ui_formincidenciai.h
 
 compiler_yacc_decl_make_all:
@@ -356 +368 @@
                 ui_formcompararmnc.h \
                 formcompararmnc.h \
+                ui_formincidenciai.h \
+                formincidenciai.h \
                 stackwidget.H \
                 accountwidget.H \
@@ -376 +390 @@
                 ui_formcompararmnc.h \
                 formcompararmnc.h \
+                ui_formincidenciai.h \
+                formincidenciai.h \
                 stackwidget.H \
                 accountwidget.H \
@@ -433 +449 @@
         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o formcompararmnc.o formcompararmnc.cpp
 
+formincidenciai.o: formincidenciai.cpp formincidenciai.h \
+                ui_formincidenciai.h
+        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o formincidenciai.o formincidenciai.cpp
+
 moc_mainwindow.o: moc_mainwindow.cpp 
         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp
@@ -475 +495 @@
         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_formcompararmnc.o moc_formcompararmnc.cpp
 
+moc_formincidenciai.o: moc_formincidenciai.cpp 
+        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_formincidenciai.o moc_formincidenciai.cpp
+
 ####### Install