Commit 15edcaaa authored by Andrey Filippov's avatar Andrey Filippov
Browse files

modified project setup

parent d5ba77fb

Makefile

+1 −2
Original line number Diff line number Diff line 


# Runs 'make', 'make install', and 'make clean' in specified subdirectories

SUBDIRS := src/php_top src/python_tests src/debugfs-webgui # src1

INSTALLDIRS = $(SUBDIRS:%=install-%)
@@ -13,7 +12,7 @@ $(SUBDIRS): 
	$(MAKE) -C $@



install: $(INSTALLDIRS)

	@echo "make install top"

	echo "make install top"



$(INSTALLDIRS): 

	$(MAKE) -C $(@:install-%=%) install

eclipse_project_setup/.project

+11 −1
Original line number Diff line number Diff line
@@ -17,8 +17,17 @@ 
			<arguments>

				<dictionary>

					<key>LaunchConfigHandle</key>

					<value>&lt;project&gt;/.externalToolBuilders/SCP to target.launch</value>

					<value>&lt;project&gt;/.externalToolBuilders/SCP web-393 to target.launch</value>

				</dictionary>

				<dictionary>

					<key>incclean</key>

					<value>true</value>

				</dictionary>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>org.python.pydev.PyDevBuilder</name>

			<arguments>

			</arguments>

		</buildCommand>

	</buildSpec>
@@ -27,5 +36,6 @@ 
		<nature>org.eclipse.cdt.core.ccnature</nature>

		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>

		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>

		<nature>org.python.pydev.pythonNature</nature>

	</natures>

</projectDescription>

src/php_top/Makefile

+12 −12
Original line number Diff line number Diff line 
DOCUMENTROOT=www/pages

DOCUMENTROOT=/www/pages

OWN = -o root -g root

INSTDOCS = 0644

INSTALL = install

#INSTALL = install

DOCS=       favicon.ico \

            robots.txt

CONFS=      autocampars.xml            

SYSCONFDIR   = etc

SYSCONFDIR   = /etc

CONFDIR      = $(SYSCONFDIR)/elphel393



PHP_SCRIPTS=camvars.php \
@@ -22,14 +22,14 @@ all: 


install:

	@echo "make install in src"

	$(INSTALL) $(OWN) -d $(DESTDIR)/$(DOCUMENTROOT)

	$(INSTALL) $(OWN) -m $(INSTDOCS) $(DOCS) $(DESTDIR)/$(DOCUMENTROOT)

	$(INSTALL) $(OWN) -m $(INSTDOCS) $(PHP_SCRIPTS) $(DESTDIR)/$(DOCUMENTROOT)

	$(INSTALL) $(OWN) -d $(DESTDIR)/$(SYSCONFDIR)

	$(INSTALL) $(OWN) -d $(DESTDIR)/$(CONFDIR)

	$(INSTALL) $(OWN) -m $(INSTDOCS) -T autocampars.xml $(DESTDIR)/$(CONFDIR)/autocampars0.xml

	$(INSTALL) $(OWN) -m $(INSTDOCS) -T autocampars.xml $(DESTDIR)/$(CONFDIR)/autocampars1.xml

	$(INSTALL) $(OWN) -m $(INSTDOCS) -T autocampars.xml $(DESTDIR)/$(CONFDIR)/autocampars2.xml

	$(INSTALL) $(OWN) -m $(INSTDOCS) -T autocampars.xml $(DESTDIR)/$(CONFDIR)/autocampars3.xml

	$(INSTALL) $(OWN) -d $(DESTDIR)$(DOCUMENTROOT)

	$(INSTALL) $(OWN) -m $(INSTDOCS) $(DOCS) $(DESTDIR)$(DOCUMENTROOT)

	$(INSTALL) $(OWN) -m $(INSTDOCS) $(PHP_SCRIPTS) $(DESTDIR)$(DOCUMENTROOT)

	$(INSTALL) $(OWN) -d $(DESTDIR)$(SYSCONFDIR)

	$(INSTALL) $(OWN) -d $(DESTDIR)$(CONFDIR)

	$(INSTALL) $(OWN) -m $(INSTDOCS) -T autocampars.xml $(DESTDIR)$(CONFDIR)/autocampars0.xml

	$(INSTALL) $(OWN) -m $(INSTDOCS) -T autocampars.xml $(DESTDIR)$(CONFDIR)/autocampars1.xml

	$(INSTALL) $(OWN) -m $(INSTDOCS) -T autocampars.xml $(DESTDIR)$(CONFDIR)/autocampars2.xml

	$(INSTALL) $(OWN) -m $(INSTDOCS) -T autocampars.xml $(DESTDIR)$(CONFDIR)/autocampars3.xml

clean:

	@echo "make clean in src"

src/python_tests/Makefile

+1 −1
Original line number Diff line number Diff line 
PYTHONROOT=$(DESTDIR)/usr/local/bin

OWN = -o root -g root

INSTPYTHON = 0755

INSTALL = install

#INSTALL = install

PYTHON_SCRIPTS = tests.py



all: